diff options
| author | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:21:47 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:49:06 +0100 |
| commit | ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe (patch) | |
| tree | 4ab573cee33f277828ad553a22579175b1dda22d /gnu/tests | |
| parent | 098bd280f82350073e8280e37d56a14162eed09c (diff) | |
| parent | f80215c7c4ae5ea0c316f4766e6c05ae4218ede3 (diff) | |
| download | guix-ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/tests')
| -rw-r--r-- | gnu/tests/base.scm | 2 | ||||
| -rw-r--r-- | gnu/tests/docker.scm | 4 | ||||
| -rw-r--r-- | gnu/tests/lightdm.scm | 6 | ||||
| -rw-r--r-- | gnu/tests/mail.scm | 20 | ||||
| -rw-r--r-- | gnu/tests/virtualization.scm | 4 |
5 files changed, 18 insertions, 18 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 3e72e193d7..97edbbc6ad 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -962,7 +962,7 @@ non-ASCII names from /tmp.") (name-service-switch %mdns-host-lookup-nss) (services (cons* (service avahi-service-type (avahi-configuration (debug? #t))) - (dbus-service) + (service dbus-root-service-type) (service dhcp-client-service-type) ;needed for multicast ;; Enable heavyweight debugging output. diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index 4267ff89a8..0276e398a7 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -48,8 +48,8 @@ (define %docker-os (simple-operating-system (service dhcp-client-service-type) - (dbus-service) - (polkit-service) + (service dbus-root-service-type) + (service polkit-service-type) (service elogind-service-type) (service docker-service-type))) diff --git a/gnu/tests/lightdm.scm b/gnu/tests/lightdm.scm index 57d029a75a..dda472bd74 100644 --- a/gnu/tests/lightdm.scm +++ b/gnu/tests/lightdm.scm @@ -46,10 +46,10 @@ (define minimal-desktop-services (list polkit-wheel-service (service upower-service-type) - (accountsservice-service) + (service accountsservice-service-type) (service polkit-service-type) - (elogind-service) - (dbus-service) + (service elogind-service-type) + (service dbus-root-service-type) x11-socket-directory-service)) (define %lightdm-os diff --git a/gnu/tests/mail.scm b/gnu/tests/mail.scm index f13751b72f..dc1f18b3f1 100644 --- a/gnu/tests/mail.scm +++ b/gnu/tests/mail.scm @@ -293,16 +293,16 @@ acl_check_data: (define %dovecot-os (simple-operating-system (service dhcp-client-service-type) - (dovecot-service #:config - (dovecot-configuration - (disable-plaintext-auth? #f) - (ssl? "no") - (auth-mechanisms '("anonymous")) - (auth-anonymous-username "alice") - (mail-location - (string-append "maildir:~/Maildir" - ":INBOX=~/Maildir/INBOX" - ":LAYOUT=fs")))))) + (service dovecot-service-type + (dovecot-configuration + (disable-plaintext-auth? #f) + (ssl? "no") + (auth-mechanisms '("anonymous")) + (auth-anonymous-username "alice") + (mail-location + (string-append "maildir:~/Maildir" + ":INBOX=~/Maildir/INBOX" + ":LAYOUT=fs")))))) (define (run-dovecot-test) "Return a test of an OS running Dovecot service." diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index 60789fbb5b..effdeb4cfa 100644 --- a/gnu/tests/virtualization.scm +++ b/gnu/tests/virtualization.scm @@ -49,8 +49,8 @@ (define %libvirt-os (simple-operating-system (service dhcp-client-service-type) - (dbus-service) - (polkit-service) + (service dbus-root-service-type) + (service polkit-service-type) (service libvirt-service-type))) (define (run-libvirt-test) |