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/base.scm | |
| parent | 9af7ecd9591b4eff41389291bbc586dcf09e2665 (diff) | |
| download | gnu-guix-892d9089a88abaa2ef1127f16308d03f4f08a4ce.tar gnu-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/base.scm')
| -rw-r--r-- | gnu/tests/base.scm | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 000a4ddecb..bcb8299c73 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -19,8 +19,6 @@ (define-module (gnu tests base) #: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 nss) #:use-module (gnu system vm) @@ -44,27 +42,7 @@ %test-nss-mdns)) (define %simple-os - (operating-system - (host-name "komputilo") - (timezone "Europe/Berlin") - (locale "en_US.UTF-8") - - (bootloader (grub-configuration (device "/dev/sdX"))) - (file-systems (cons (file-system - (device "my-root") - (title 'label) - (mount-point "/") - (type "ext4")) - %base-file-systems)) - (firmware '()) - - (users (cons (user-account - (name "alice") - (comment "Bob's sister") - (group "users") - (supplementary-groups '("wheel" "audio" "video")) - (home-directory "/home/alice")) - %base-user-accounts)))) + (simple-operating-system)) (define* (run-basic-test os command #:optional (name "basic") @@ -420,10 +398,8 @@ functionality tests.") #:user "alice")) (job3 #~(job next-second-from ;to test $PATH "touch witness-touch"))) - (operating-system - (inherit %simple-os) - (services (cons (mcron-service (list job1 job2 job3)) - (operating-system-user-services %simple-os)))))) + (simple-operating-system + (mcron-service (list job1 job2 job3))))) (define (run-mcron-test name) (mlet* %store-monad ((os -> (marionette-operating-system |