diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/containers.scm | 13 | ||||
| -rw-r--r-- | tests/cpan.scm | 4 | ||||
| -rw-r--r-- | tests/cran.scm | 4 |
3 files changed, 16 insertions, 5 deletions
diff --git a/tests/containers.scm b/tests/containers.scm index 698bef3e47..ccd122ac79 100644 --- a/tests/containers.scm +++ b/tests/containers.scm @@ -20,6 +20,7 @@ #:use-module (guix utils) #:use-module (guix build syscalls) #:use-module (gnu build linux-container) + #:use-module (gnu system file-systems) #:use-module (srfi srfi-64) #:use-module (ice-9 match)) @@ -80,7 +81,10 @@ (skip-if-unsupported) (test-assert "call-with-container, mnt namespace" (zero? - (call-with-container '(("none" device "/testing" "tmpfs" () #f #f)) + (call-with-container (list (file-system + (device "none") + (mount-point "/testing") + (type "tmpfs"))) (lambda () (assert-exit (file-exists? "/testing"))) #:namespaces '(user mnt)))) @@ -91,8 +95,11 @@ ;; An exception should be raised; see <http://bugs.gnu.org/23306>. (catch 'system-error (lambda () - (call-with-container '(("/does-not-exist" device "/foo" - "none" (bind-mount) #f #f)) + (call-with-container (list (file-system + (device "/does-not-exist") + (mount-point "/foo") + (type "none") + (flags '(bind-mount)))) (const #t) #:namespaces '(user mnt))) (lambda args diff --git a/tests/cpan.scm b/tests/cpan.scm index 80ff044abd..e37fc437fc 100644 --- a/tests/cpan.scm +++ b/tests/cpan.scm @@ -61,7 +61,9 @@ (test-assert "cpan->guix-package" ;; Replace network resources with sample data. (mock ((guix build download) url-fetch - (lambda* (url file-name #:key (mirrors '())) + (lambda* (url file-name + #:key + (mirrors '()) verify-certificate?) (with-output-to-file file-name (lambda () (display diff --git a/tests/cran.scm b/tests/cran.scm index 896c5af06c..f92934c468 100644 --- a/tests/cran.scm +++ b/tests/cran.scm @@ -89,7 +89,9 @@ Date/Publication: 2015-07-14 14:15:16 (test-assert "description->package" ;; Replace network resources with sample data. (mock ((guix build download) url-fetch - (lambda* (url file-name #:key (mirrors '())) + (lambda* (url file-name + #:key + (mirrors '()) verify-certificate?) (with-output-to-file file-name (lambda () (display |