summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-01-19 15:44:12 +0100
committerLudovic Courtès <ludo@gnu.org>2015-01-19 15:44:12 +0100
commitd35c5e29b6cae013aa0f4e8b075670010b9c9ce1 (patch)
tree72add18713d815b7615084e38307df4ab191a62e /tests
parent510023184aaea1ea42b999fa6219bc73809da383 (diff)
downloadguix-d35c5e29b6cae013aa0f4e8b075670010b9c9ce1.tar.gz
tests: Adjust syscall tests for 2.6ish Linux.
* tests/syscalls.scm ("set-network-interface-flags",
  "set-network-interface-address"): Accept EACCES as a valid result.
Diffstat (limited to 'tests')
-rw-r--r--tests/syscalls.scm14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/syscalls.scm b/tests/syscalls.scm
index 21d6637ff6..f26331e164 100644
--- a/tests/syscalls.scm
+++ b/tests/syscalls.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -91,15 +91,15 @@
            (system-error-errno args)))))
 
 (test-skip (if (zero? (getuid)) 1 0))
-(test-equal "set-network-interface-flags"
-  EPERM
+(test-assert "set-network-interface-flags"
   (let ((sock (socket AF_INET SOCK_STREAM 0)))
     (catch 'system-error
       (lambda ()
         (set-network-interface-flags sock "lo" IFF_UP))
       (lambda args
         (close-port sock)
-        (system-error-errno args)))))
+        ;; We get EPERM with Linux 3.18ish and EACCES with 2.6.32.
+        (memv (system-error-errno args) (list EPERM EACCES))))))
 
 (test-equal "network-interface-address lo"
   (make-socket-address AF_INET (inet-pton AF_INET "127.0.0.1") 0)
@@ -108,8 +108,7 @@
     (close-port sock)
     addr))
 
-(test-equal "set-network-interface-address"
-  EPERM
+(test-assert "set-network-interface-address"
   (let ((sock (socket AF_INET SOCK_STREAM 0)))
     (catch 'system-error
       (lambda ()
@@ -120,7 +119,8 @@
                                         0)))
       (lambda args
         (close-port sock)
-        (system-error-errno args)))))
+        ;; We get EPERM with Linux 3.18ish and EACCES with 2.6.32.
+        (memv (system-error-errno args) (list EPERM EACCES))))))
 
 (test-end)