futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: opensmtpd: Check /var/spool/mail instead of /var/mail.

Browse Source 
The test had been failing since the upgrade to 6.6.3p1 in commit
2dbfd8eec43b602d23cee3fdd2842cc333e36c24.

* gnu/services/mail.scm (opensmtpd-activation): Create /var/spool/mail.
* gnu/tests/mail.scm (run-opensmtpd-test): Check /var/spool/mail instead
of /var/mail.
This commit is contained in:
Ludovic Courtès 2020-03-16 12:21:05 +01:00
parent c215d9ec1c
commit a37e03d60e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/services/mail.scm
View File

@ -1670,7 +1670,9 @@ match from local for any action outbound
;; Create mbox and spool directories. ;; Create mbox and spool directories.
(mkdir-p "/var/mail") (mkdir-p "/var/mail")
(mkdir-p "/var/spool/smtpd") (mkdir-p "/var/spool/smtpd")
(chmod "/var/spool/smtpd" #o711)))))) (chmod "/var/spool/smtpd" #o711)
(mkdir-p "/var/spool/mail")
(chmod "/var/spool/mail" #o711))))))
(define %opensmtpd-pam-services (define %opensmtpd-pam-services
(list (unix-pam-service "smtpd"))) (list (unix-pam-service "smtpd")))

6
gnu/tests/mail.scm
View File

@ -99,8 +99,8 @@ match from any for local action inbound
(test-assert "mbox is empty" (test-assert "mbox is empty"
(marionette-eval (marionette-eval
'(and (file-exists? "/var/mail") '(and (file-exists? "/var/spool/mail")
(not (file-exists? "/var/mail/root"))) (not (file-exists? "/var/spool/mail/root")))
marionette)) marionette))
(test-eq "accept an email" (test-eq "accept an email"
@ -150,7 +150,7 @@ match from any for local action inbound
(let wait ((n 20)) (let wait ((n 20))
(cond ((queue-empty?) (cond ((queue-empty?)
(file-exists? "/var/mail/root")) (file-exists? "/var/spool/mail/root"))
((zero? n) ((zero? n)
(error "root mailbox didn't show up")) (error "root mailbox didn't show up"))
(else (else