diff options
Diffstat (limited to 'gnu/tests')
| -rw-r--r-- | gnu/tests/messaging.scm | 21 | ||||
| -rw-r--r-- | gnu/tests/version-control.scm | 32 | ||||
| -rw-r--r-- | gnu/tests/web.scm | 6 |
3 files changed, 7 insertions, 52 deletions
diff --git a/gnu/tests/messaging.scm b/gnu/tests/messaging.scm index 202a1c2f73..1e26c0ddea 100644 --- a/gnu/tests/messaging.scm +++ b/gnu/tests/messaging.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> -;;; Copyright © 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2017-2018, 2021-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. @@ -198,25 +198,6 @@ (start-service 'bitlbee)) marionette)) - (test-equal "valid PID" - #$(file-append bitlbee "/sbin/bitlbee") - (marionette-eval - '(begin - (use-modules (srfi srfi-1) - (gnu services herd)) - - (let ((bitlbee - (find (lambda (service) - (equal? '(bitlbee) - (live-service-provision service))) - (current-services)))) - (and (pk 'bitlbee-service bitlbee) - (let ((pid (live-service-running bitlbee))) - (readlink (string-append "/proc/" - (number->string pid) - "/exe")))))) - marionette)) - (test-assert "connect" (let* ((address (make-socket-address AF_INET INADDR_LOOPBACK 6667)) diff --git a/gnu/tests/version-control.scm b/gnu/tests/version-control.scm index fd3dba88ba..18c68a58f2 100644 --- a/gnu/tests/version-control.scm +++ b/gnu/tests/version-control.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com> -;;; Copyright © 2017, 2018, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2017-2018, 2020-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Christopher Baines <mail@cbaines.net> ;;; @@ -154,19 +154,11 @@ HTTP-PORT." ;; Wait for nginx to be up and running. (test-assert "nginx running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'nginx)) - marionette)) + (wait-for-file "/var/run/nginx/pid" marionette)) ;; Wait for fcgiwrap to be up and running. (test-assert "fcgiwrap running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'fcgiwrap)) - marionette)) + (wait-for-tcp-port 9000 marionette)) ;; Make sure the PID file is created. (test-assert "PID file" @@ -272,11 +264,7 @@ HTTP-PORT." ;; Wait for nginx to be up and running. (test-assert "nginx running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'nginx)) - marionette)) + (wait-for-file "/var/run/nginx/pid" marionette)) ;; Make sure Git test repository is created. (test-assert "Git test repository" @@ -486,17 +474,7 @@ HTTP-PORT." ;; Wait for nginx to be up and running. (test-assert "nginx running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'nginx)) - marionette)) - - ;; Make sure the PID file is created. - (test-assert "PID file" - (marionette-eval - '(file-exists? "/var/run/nginx/pid") - marionette)) + (wait-for-file "/var/run/nginx/pid" marionette)) ;; Make sure Git test repository is created. (test-assert "Git test repository" diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 4e8eceaa2b..7a585e618d 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -481,11 +481,7 @@ HTTP-PORT." (test-begin "tailon") (test-assert "service running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'tailon)) - marionette)) + (wait-for-tcp-port 8080 marionette)) (test-equal "http-get" 200 |