aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-03-16 12:21:05 +0100
committerLudovic Courtès <ludo@gnu.org>2020-03-16 14:05:52 +0100
commita37e03d60e18dfcf119d0b92d9008e54fc350bf1 (patch)
tree81842b2e3e38da31810b042b2ceebf16c5792c8c
parentc215d9ec1ce108844b14c0c2952199a0da5f4176 (diff)
downloadguix-a37e03d60e18dfcf119d0b92d9008e54fc350bf1.tar
guix-a37e03d60e18dfcf119d0b92d9008e54fc350bf1.tar.gz
tests: opensmtpd: Check /var/spool/mail instead of /var/mail.
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.
-rw-r--r--gnu/services/mail.scm4
-rw-r--r--gnu/tests/mail.scm6
2 files changed, 6 insertions, 4 deletions
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index d97316512f..7791780dfc 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -1670,7 +1670,9 @@ match from local for any action outbound
;; Create mbox and spool directories.
(mkdir-p "/var/mail")
(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
(list (unix-pam-service "smtpd")))
diff --git a/gnu/tests/mail.scm b/gnu/tests/mail.scm
index 58172cd1d6..a50fb1dbca 100644
--- a/gnu/tests/mail.scm
+++ b/gnu/tests/mail.scm
@@ -99,8 +99,8 @@ match from any for local action inbound
(test-assert "mbox is empty"
(marionette-eval
- '(and (file-exists? "/var/mail")
- (not (file-exists? "/var/mail/root")))
+ '(and (file-exists? "/var/spool/mail")
+ (not (file-exists? "/var/spool/mail/root")))
marionette))
(test-eq "accept an email"
@@ -150,7 +150,7 @@ match from any for local action inbound
(let wait ((n 20))
(cond ((queue-empty?)
- (file-exists? "/var/mail/root"))
+ (file-exists? "/var/spool/mail/root"))
((zero? n)
(error "root mailbox didn't show up"))
(else