diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-04-18 18:30:13 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-04-18 18:30:13 +0200 |
| commit | 8c4b4b65624198261d6e583214da9aa7c5524290 (patch) | |
| tree | 5950b2d9e7608d154109b69dc349d1ab2b3ab371 /gnu/tests | |
| parent | 40522a7e89bc169233ec724592c9439e8004f4ad (diff) | |
| parent | f8818360d5c185543b4bd1ad1c3c3ad7191af0c4 (diff) | |
| download | guix-8c4b4b65624198261d6e583214da9aa7c5524290.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/tests')
| -rw-r--r-- | gnu/tests/base.scm | 2 | ||||
| -rw-r--r-- | gnu/tests/dict.scm | 9 | ||||
| -rw-r--r-- | gnu/tests/web.scm | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index bcb8299c73..6ce5ab3de1 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -56,7 +56,7 @@ passed a gexp denoting the marionette, and it must return gexp that is inserted before the first test. This is used to introduce an extra initialization step, such as entering a LUKS passphrase." (define special-files - (service-parameters + (service-value (fold-services (operating-system-services os) #:target-type special-files-service-type))) diff --git a/gnu/tests/dict.scm b/gnu/tests/dict.scm index f7a48ab634..16b6edbd9e 100644 --- a/gnu/tests/dict.scm +++ b/gnu/tests/dict.scm @@ -97,15 +97,16 @@ '(begin (use-modules (ice-9 rdelim)) (let ((sock (socket PF_INET SOCK_STREAM 0))) - (let loop () - (pk 'try) + (let loop ((i 0)) + (pk 'try i) (catch 'system-error (lambda () (connect sock AF_INET INADDR_LOOPBACK 2628)) (lambda args (pk 'connection-error args) - (sleep 1) - (loop)))) + (when (< i 20) + (sleep 1) + (loop (+ 1 i)))))) (read-line sock 'concat))) marionette)) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index cdc5791237..bc7e3b89a9 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -19,7 +19,6 @@ (define-module (gnu tests web) #:use-module (gnu tests) #:use-module (gnu system) - #:use-module (gnu system grub) #:use-module (gnu system file-systems) #:use-module (gnu system shadow) #:use-module (gnu system vm) |