aboutsummaryrefslogtreecommitdiff
path: root/gnu/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-01-10 23:33:36 +0100
committerLudovic Courtès <ludo@gnu.org>2019-01-11 12:14:38 +0100
commit84a2de36a10dc2ab80f86e16721cbd228c85279e (patch)
tree83be420bf45f903b0c6202f37802a925b129f275 /gnu/tests
parentbabfd9447df08a809622238b4830eb046dab2ba6 (diff)
downloadguix-84a2de36a10dc2ab80f86e16721cbd228c85279e.tar
guix-84a2de36a10dc2ab80f86e16721cbd228c85279e.tar.gz
services: Deprecate a few more service procedures.
These procedures were already either undocumented (and de facto deprecated) or documented as deprecated or redundant. * gnu/services/base.scm (guix-service, guix-publish-service): Mark as deprecated. * gnu/services/mcron.scm (mcron-service): Likewise. * gnu/services/networking.scm (tor-service): Likewise. * doc/guix.texi (Scheduled Job Execution): Remove 'mcron-service' and adjust example. (Networking Services): Remove 'tor-service'. * gnu/tests/base.scm (%mcron-os): Use 'mcron-service-type' instead of 'mcron-service'. * gnu/tests/networking.scm (%tor-os): Use 'tor-service-type' instead of 'tor-service'. * tests/guix-system.sh: Likewise.
Diffstat (limited to 'gnu/tests')
-rw-r--r--gnu/tests/base.scm5
-rw-r--r--gnu/tests/networking.scm2
2 files changed, 4 insertions, 3 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index 8d4e218a8f..2b20aac1dc 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;;
;;; This file is part of GNU Guix.
@@ -627,7 +627,8 @@ non-ASCII names from /tmp.")
(job3 #~(job next-second-from ;to test $PATH
"touch witness-touch")))
(simple-operating-system
- (mcron-service (list job1 job2 job3)))))
+ (service mcron-service-type
+ (mcron-configuration (jobs (list job1 job2 job3)))))))
(define (run-mcron-test name)
(define os
diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm
index 9f12a4ae8d..a97b29bc4b 100644
--- a/gnu/tests/networking.scm
+++ b/gnu/tests/networking.scm
@@ -351,7 +351,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
(define %tor-os
(simple-operating-system
- (tor-service)))
+ (service tor-service-type)))
(define %tor-os/unix-socks-socket
(simple-operating-system