diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-03-31 22:13:50 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-04-01 00:45:18 +0200 |
| commit | 892d9089a88abaa2ef1127f16308d03f4f08a4ce (patch) | |
| tree | f6ea39e959f3d40e38f741be75d7d160c15e446d /gnu/tests/messaging.scm | |
| parent | 9af7ecd9591b4eff41389291bbc586dcf09e2665 (diff) | |
| download | guix-892d9089a88abaa2ef1127f16308d03f4f08a4ce.tar guix-892d9089a88abaa2ef1127f16308d03f4f08a4ce.tar.gz | |
tests: Introduce 'simple-operating-system' and use it.
* gnu/tests.scm (%simple-os): New macro.
(simple-operating-system): New macro.
* gnu/tests/base.scm (%simple-os): Define using 'simple-operating-system'.
(%mcron-os): Use 'simple-operating-system'.
* gnu/tests/mail.scm (%opensmtpd-os): Likewise.
* gnu/tests/messaging.scm (%base-os, os-with-service): Remove.
(run-xmpp-test): Use 'simple-operating-system'.
* gnu/tests/networking.scm (%inetd-os): Likewise.
* gnu/tests/ssh.scm (%base-os, os-with-service): Remove.
(run-ssh-test): Use 'simple-operating-system'.
* gnu/tests/web.scm (%nginx-os): Likewise.
Diffstat (limited to 'gnu/tests/messaging.scm')
| -rw-r--r-- | gnu/tests/messaging.scm | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/gnu/tests/messaging.scm b/gnu/tests/messaging.scm index b0c8254ce0..cefb52534a 100644 --- a/gnu/tests/messaging.scm +++ b/gnu/tests/messaging.scm @@ -19,12 +19,8 @@ (define-module (gnu tests messaging) #: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) #:use-module (gnu services) - #:use-module (gnu services base) #:use-module (gnu services messaging) #:use-module (gnu services networking) #:use-module (gnu packages messaging) @@ -33,30 +29,11 @@ #:use-module (guix monads) #:export (%test-prosody)) -(define %base-os - (operating-system - (host-name "komputilo") - (timezone "Europe/Berlin") - (locale "en_US.UTF-8") - - (bootloader (grub-configuration (device "/dev/sdX"))) - (file-systems %base-file-systems) - (firmware '()) - (users %base-user-accounts) - (services (cons (dhcp-client-service) - %base-services)))) - -(define (os-with-service service) - "Return a test operating system that runs SERVICE." - (operating-system - (inherit %base-os) - (services (cons service - (operating-system-user-services %base-os))))) - (define (run-xmpp-test name xmpp-service pid-file create-account) "Run a test of an OS running XMPP-SERVICE, which writes its PID to PID-FILE." (mlet* %store-monad ((os -> (marionette-operating-system - (os-with-service xmpp-service) + (simple-operating-system (dhcp-client-service) + xmpp-service) #:imported-modules '((gnu services herd)))) (command (system-qemu-image/shared-store-script os #:graphic? #f)) |