tests: mpd: Remove race condition; use default MPD configuration.

* gnu/tests/audio.scm (%mpd-os): Use the default 'mpd-configuration'.
(run-mpd-test)[test]("mpd listening"): New test.
("mpc connect"): Use 'system*' and 'test-equal'.
This commit is contained in:
Ludovic Courtès 2020-11-06 23:12:12 +01:00
parent bb124f6e9c
commit 9909eddbc5
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -28,9 +28,7 @@ (define-module (gnu tests audio)
(define %mpd-os
(simple-operating-system
(service mpd-service-type
(mpd-configuration
(user "root")))))
(service mpd-service-type)))
(define (run-mpd-test)
"Run tests in %mpd-os, which has mpd running."
@ -62,9 +60,14 @@ (define marionette
(start-service 'mpd))
marionette))
(test-assert "mpc connect"
(test-assert "mpd listening"
;; Wait until mpd is actually listening before spawning 'mpc'.
(wait-for-tcp-port 6600 marionette))
(test-equal "mpc connect"
0
(marionette-eval
'(zero? (system #$(file-append mpd-mpc "/bin/mpc")))
'(system* #$(file-append mpd-mpc "/bin/mpc"))
marionette))
(test-end)