diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
| commit | 030f6f489fe9544f35ebaf95135acd1dd67ce63f (patch) | |
| tree | f1d5d1f1b68de81daec6f05d032a0410a475d960 /gnu/tests | |
| parent | 95c14929a7fbd3c55c5e8756953c2f257625e2b7 (diff) | |
| parent | 938df0de739aa13c2fb483f440ec1db281a52aaa (diff) | |
| download | guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: etc/news.scm gnu/local.mk gnu/packages/bootloaders.scm gnu/packages/linphone.scm gnu/packages/linux.scm gnu/packages/tls.scm gnu/system.scm
Diffstat (limited to 'gnu/tests')
| -rw-r--r-- | gnu/tests/linux-modules.scm | 11 | ||||
| -rw-r--r-- | gnu/tests/ssh.scm | 5 | ||||
| -rw-r--r-- | gnu/tests/web.scm | 5 |
3 files changed, 18 insertions, 3 deletions
diff --git a/gnu/tests/linux-modules.scm b/gnu/tests/linux-modules.scm index 788bdc848a..953b132ef7 100644 --- a/gnu/tests/linux-modules.scm +++ b/gnu/tests/linux-modules.scm @@ -28,8 +28,10 @@ #:use-module (guix derivations) #:use-module (guix gexp) #:use-module (guix modules) + #:use-module (guix packages) #:use-module (guix monads) #:use-module (guix store) + #:use-module (guix utils) #:export (%test-loadable-kernel-modules-0 %test-loadable-kernel-modules-1 %test-loadable-kernel-modules-2)) @@ -118,5 +120,12 @@ with one extra module.") (description "Tests loadable kernel modules facility of <operating-system> with two extra modules.") (value (run-loadable-kernel-modules-test - (list acpi-call-linux-module ddcci-driver-linux) + (list acpi-call-linux-module + (package + (inherit ddcci-driver-linux) + (arguments + `(#:linux #f + ,@(strip-keyword-arguments '(#:linux) + (package-arguments + ddcci-driver-linux)))))) '("acpi_call" "ddcci"))))) diff --git a/gnu/tests/ssh.scm b/gnu/tests/ssh.scm index a74227ea4a..10438ad22a 100644 --- a/gnu/tests/ssh.scm +++ b/gnu/tests/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; @@ -136,6 +136,9 @@ root with an empty password." (current-services)))) marionette)) + (test-assert "wait for port 22" + (wait-for-tcp-port 22 marionette)) + ;; Connect to the guest over SSH. Make sure we can run a shell ;; command there. (test-equal "shell command" diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 7c1c0aa511..1c984dd6f4 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2017, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2019 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> @@ -110,6 +110,9 @@ HTTP-PORT." ((pid) (number? pid)))))) marionette)) + (test-assert "HTTP port ready" + (wait-for-tcp-port #$forwarded-port marionette)) + ;; Retrieve the index.html file we put in /srv. (test-equal "http-get" '(200 #$%index.html-contents) |