diff options
| author | Clément Lassieur <clement@lassieur.org> | 2018-06-11 21:07:24 +0200 |
|---|---|---|
| committer | Clément Lassieur <clement@lassieur.org> | 2018-06-13 09:11:45 +0200 |
| commit | c24b15472baaa7ec67d48cbf296bbe5ab727b78f (patch) | |
| tree | b38470167d03a42d981e82a748d530cd1c4128b0 /gnu/tests/version-control.scm | |
| parent | 14618a1ebb8060b163acd1615c828aa2c62d0651 (diff) | |
tests: Honor the return value of 'start-service'.
Since commit dc7b3e56337ee9d8dcd8fe7d5cab71ef536d024f, 'start-service' returns
the Shepherd's representation of the service as a sexp, and '#f' if the
service fails to start. Also, it doesn't throw an exception when the service
fails to start, so relying on an exception instead of relying on its return
value is a false positive.
* gnu/tests/base.scm (run-nss-mdns-test): Split tests so to check the return
value of 'start-service'.
(run-mcron-test, run-nss-mdns-test): Use 'test-assert' with the return value
of 'start-service'.
* gnu/tests/admin.scm (run-tailon-test): Idem.
* gnu/tests/dict.scm (run-dicod-test): Idem.
* gnu/tests/mail.scm (run-opensmtpd-test, run-exim-test, run-dovecot-test):
Idem.
* gnu/tests/messaging.scm (run-xmpp-test, run-bitlbee-test): Idem.
* gnu/tests/nfs.scm (run-nfs-test): Idem.
* gnu/tests/rsync.scm (run-rsync-test): Idem.
* gnu/tests/ssh.scm (run-ssh-test): Idem.
* gnu/tests/version-control.scm (run-cgit-test, run-git-http-test): Idem.
* gnu/tests/web.scm (run-php-fpm-test): Idem.
Diffstat (limited to 'gnu/tests/version-control.scm')
| -rw-r--r-- | gnu/tests/version-control.scm | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gnu/tests/version-control.scm b/gnu/tests/version-control.scm index 8024739734d..3b935a1b485 100644 --- a/gnu/tests/version-control.scm +++ b/gnu/tests/version-control.scm | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com> | 2 | ;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com> |
| 3 | ;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org> | 3 | ;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org> |
| 4 | ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> | 4 | ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> |
| 5 | ;;; | 5 | ;;; |
| 6 | ;;; This file is part of GNU Guix. | 6 | ;;; This file is part of GNU Guix. |
| 7 | ;;; | 7 | ;;; |
| @@ -147,23 +147,19 @@ HTTP-PORT." | |||
| 147 | marionette)) | 147 | marionette)) |
| 148 | 148 | ||
| 149 | ;; Wait for nginx to be up and running. | 149 | ;; Wait for nginx to be up and running. |
| 150 | (test-eq "nginx running" | 150 | (test-assert "nginx running" |
| 151 | 'running! | ||
| 152 | (marionette-eval | 151 | (marionette-eval |
| 153 | '(begin | 152 | '(begin |
| 154 | (use-modules (gnu services herd)) | 153 | (use-modules (gnu services herd)) |
| 155 | (start-service 'nginx) | 154 | (start-service 'nginx)) |
| 156 | 'running!) | ||
| 157 | marionette)) | 155 | marionette)) |
| 158 | 156 | ||
| 159 | ;; Wait for fcgiwrap to be up and running. | 157 | ;; Wait for fcgiwrap to be up and running. |
| 160 | (test-eq "fcgiwrap running" | 158 | (test-assert "fcgiwrap running" |
| 161 | 'running! | ||
| 162 | (marionette-eval | 159 | (marionette-eval |
| 163 | '(begin | 160 | '(begin |
| 164 | (use-modules (gnu services herd)) | 161 | (use-modules (gnu services herd)) |
| 165 | (start-service 'fcgiwrap) | 162 | (start-service 'fcgiwrap)) |
| 166 | 'running!) | ||
| 167 | marionette)) | 163 | marionette)) |
| 168 | 164 | ||
| 169 | ;; Make sure the PID file is created. | 165 | ;; Make sure the PID file is created. |
| @@ -272,13 +268,11 @@ HTTP-PORT." | |||
| 272 | (test-begin "git-http") | 268 | (test-begin "git-http") |
| 273 | 269 | ||
| 274 | ;; Wait for nginx to be up and running. | 270 | ;; Wait for nginx to be up and running. |
| 275 | (test-eq "nginx running" | 271 | (test-assert "nginx running" |
| 276 | 'running! | ||
| 277 | (marionette-eval | 272 | (marionette-eval |
| 278 | '(begin | 273 | '(begin |
| 279 | (use-modules (gnu services herd)) | 274 | (use-modules (gnu services herd)) |
| 280 | (start-service 'nginx) | 275 | (start-service 'nginx)) |
| 281 | 'running!) | ||
| 282 | marionette)) | 276 | marionette)) |
| 283 | 277 | ||
| 284 | ;; Make sure Git test repository is created. | 278 | ;; Make sure Git test repository is created. |
