guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/06: tests: Deal with 'mount-points' not returning "/".


From: Ludovic Courtès
Subject: 03/06: tests: Deal with 'mount-points' not returning "/".
Date: Mon, 06 Apr 2015 19:56:09 +0000

civodul pushed a commit to branch master
in repository guix.

commit 381ac93b5ed7bd51f8f3ab6a8b0127f8ea6288f8
Author: Ludovic Courtès <address@hidden>
Date:   Mon Apr 6 21:05:38 2015 +0200

    tests: Deal with 'mount-points' not returning "/".
    
    Fixes <http://bugs.gnu.org/20261>.
    Reported by Mark H Weaver <address@hidden>.
    
    * tests/syscalls.scm ("mount-points"): Check for a few other likely
      mount points in addition to "/".
---
 tests/syscalls.scm |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/tests/syscalls.scm b/tests/syscalls.scm
index f26331e..706f3df 100644
--- a/tests/syscalls.scm
+++ b/tests/syscalls.scm
@@ -19,6 +19,7 @@
 (define-module (test-syscalls)
   #:use-module (guix build syscalls)
   #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-64)
   #:use-module (ice-9 match))
 
@@ -45,7 +46,10 @@
       (memv (system-error-errno args) (list EPERM ENOENT)))))
 
 (test-assert "mount-points"
-  (member "/" (mount-points)))
+  ;; Reportedly "/" is not always listed as a mount point, so check a few
+  ;; others (see <http://bugs.gnu.org/20261>.)
+  (any (cute member <> (mount-points))
+       '("/" "/proc" "/sys" "/dev")))
 
 (test-assert "swapon, ENOENT/EPERM"
   (catch 'system-error



reply via email to

[Prev in Thread] Current Thread [Next in Thread]