tests: Fix loadable-kernel-modules-service tests.

* gnu/tests/linux-modules.scm
(run-loadable-kernel-modules-service-test): Actually load the modules
with kernel-module-loader-service-type.  Use a singleton service instead
of defining a custom one.
* doc/guix.texi (Service Reference): To give an example of
linux-loadable-module-service-type use a singleton instead of defining a
new service.

2 files changed, 10 insertions, 16 deletions

diff --git a/doc/guix.texi b/doc/guix.texi
index 0126099d68..39dc2446ef 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -76,7 +76,7 @@ Copyright @copyright{} 2020 Damien Cassou@*
 Copyright @copyright{} 2020 Jakub Kądziołka@*
 Copyright @copyright{} 2020 Jack Hill@*
 Copyright @copyright{} 2020 Naga Malleswari@*
-Copyright @copyright{} 2020 Brice Waegeneire@*
+Copyright @copyright{} 2020, 2021 Brice Waegeneire@*
 Copyright @copyright{} 2020 R Veera Kumar@*
 Copyright @copyright{} 2020 Pierre Langlois@*
 Copyright @copyright{} 2020 pinoaffe@*
@@ -34379,13 +34379,10 @@ This service type is intended to be extended by other service types,
 such as below:
 
 @lisp
-(define module-installing-service-type
-  (service-type
-    (name 'module-installing-service)
-    (extensions (list (service-extension linux-loadable-module-service-type
-                                         (const (list module-to-install-1
-                                                      module-to-install-2)))))
-    (default-value #f)))
+(simple-service 'installing-module
+                linux-loadable-module-service-type
+                (list module-to-install-1
+                      module-to-install-2))
 @end lisp
 
 This does not actually load modules at bootup, only adds it to the
diff --git a/gnu/tests/linux-modules.scm b/gnu/tests/linux-modules.scm
index 30d8eae03b..fc8945b77f 100644
--- a/gnu/tests/linux-modules.scm
+++ b/gnu/tests/linux-modules.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
 ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
-;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -112,16 +112,13 @@ are loaded in memory."
   "Run a test of an OS having MODULE-PACKAGES, which are loaded by creating a
 service that extends LINUXL-LOADABLE-MODULE-SERVICE-TYPE. Then verify that
 MODULE-NAMES are loaded in memory."
-  (define module-installing-service-type
-    (service-type
-      (name 'module-installing-service)
-      (extensions (list (service-extension linux-loadable-module-service-type
-                                           (const module-packages))))
-      (default-value #f)))
   (run-loadable-kernel-modules-test-base
     (operating-system
       (inherit (simple-operating-system))
-      (services (cons* (service module-installing-service-type)
+      (services (cons* (simple-service 'installing-module
+                                       linux-loadable-module-service-type
+                                       module-packages)
+                       (service kernel-module-loader-service-type module-names)
                        (operating-system-user-services
                         (simple-operating-system)))))
     module-names))