Merge branch 'master' into core-updates

2 files changed, 131 insertions, 6 deletions

diff --git a/gnu/tests/cups.scm b/gnu/tests/cups.scm
new file mode 100644
index 0000000000..4e922e5023
--- /dev/null
+++ b/gnu/tests/cups.scm
@@ -0,0 +1,119 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu tests cups)
+  #:use-module (gnu tests)
+  #:use-module (gnu system)
+  #:use-module (gnu system vm)
+  #:use-module (gnu services)
+  #:use-module (gnu services cups)
+  #:use-module (gnu services networking)
+  #:use-module (guix gexp)
+  #:use-module (guix store)
+  #:use-module (guix monads)
+  #:export (%test-cups))
+
+;;;
+;;; Test the Common Unix Printing System.
+;;;
+
+(define* (run-cups-test os-configuration #:optional (cups-port 631))
+  (define os
+    (marionette-operating-system os-configuration
+                                 #:imported-modules '((gnu services herd))))
+
+  (define forwarded-port 8080)
+
+  (define vm
+    (virtual-machine
+     (operating-system os)
+     (port-forwardings `((,forwarded-port . ,cups-port)))))
+
+  (define test
+    (with-imported-modules '((gnu build marionette))
+      #~(begin
+          (use-modules (gnu build marionette)
+                       (srfi srfi-11) (srfi srfi-64)
+                       (web client) (web response))
+
+          (define marionette
+            (make-marionette (list #$vm)))
+
+          (mkdir #$output)
+          (chdir #$output)
+
+          (test-begin "cups")
+
+          ;; Wait for the web interface to become ready.
+          (wait-for-tcp-port #$cups-port marionette)
+
+          (test-equal "http-get default page"
+            200
+            (let-values
+                (((response text)
+                  (http-get #$(simple-format
+                               #f "http://localhost:~A/" forwarded-port)
+                            #:decode-body? #t)))
+              (response-code response)))
+
+          (test-equal "http-get admin page"
+            200
+            (let-values
+                (((response text)
+                  (http-get #$(simple-format
+                               #f "http://localhost:~A/admin" forwarded-port)
+                            #:decode-body? #t)))
+              (response-code response)))
+
+          (test-end)
+          (exit (= (test-runner-fail-count (test-runner-current)) 0)))))
+
+  (gexp->derivation "cups-test" test))
+
+(define %cups-os
+  (simple-operating-system
+   (service dhcp-client-service-type)
+   (service cups-service-type
+            (cups-configuration
+             (web-interface? #t)
+             ;; Listen on all interfaces instead of just localhost so we
+             ;; can access the web interface "remotely".
+             (listen '("*:631" "/var/run/cups/cups.sock"))
+             ;; Add access controls for the Qemu-managed network.
+             (location-access-controls
+              (list (location-access-control
+                     (path "/")
+                     (access-controls '("Order allow,deny"
+                                        "Allow from 10.0.0.0/8")))
+                    (location-access-control
+                     (path "/admin")
+                     (access-controls '("Order allow,deny"
+                                        "Allow from 10.0.0.0/8")))
+                    (location-access-control
+                     (path "/admin/conf")
+                     (access-controls '("Order allow,deny"
+                                        "AuthType Basic"
+                                        "Require user @SYSTEM"
+                                        "Allow localhost")))))))))
+
+(define %test-cups
+  (system-test
+   (name "cups")
+   (description "Test the CUPS print server")
+   (value (run-cups-test %cups-os))))
+
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index d475bda2c7..335efbd468 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -651,9 +651,13 @@ by 'mdadm'.")
                                                   (guix combinators)))))
                     %base-services))))
 
+(define %luks-passphrase
+  ;; LUKS encryption passphrase used in tests.
+  "thepassphrase")
+
 (define %encrypted-root-installation-script
   ;; Shell script of a simple installation.
-  "\
+  (string-append "\
 . /etc/profile
 set -e -x
 guix --version
@@ -665,9 +669,9 @@ parted --script /dev/vdb mklabel gpt \\
   mkpart primary ext2 3M 1.4G \\
   set 1 boot on \\
   set 1 bios_grub on
-echo -n thepassphrase | \\
+echo -n " %luks-passphrase " | \\
   cryptsetup luksFormat --uuid=12345678-1234-1234-1234-123456789abc -q /dev/vdb2 -
-echo -n thepassphrase | \\
+echo -n " %luks-passphrase " | \\
   cryptsetup open --type luks --key-file - /dev/vdb2 the-root-device
 mkfs.ext4 -L my-root /dev/mapper/the-root-device
 mount LABEL=my-root /mnt
@@ -677,7 +681,7 @@ cp /etc/target-config.scm /mnt/etc/config.scm
 guix system build /mnt/etc/config.scm
 guix system init /mnt/etc/config.scm /mnt --no-substitutes
 sync
-reboot\n")
+reboot\n"))
 
 (define (enter-luks-passphrase marionette)
   "Return a gexp to be inserted in the basic system test running on MARIONETTE
@@ -698,7 +702,8 @@ to enter the LUKS passphrase."
             ;; when the passphrase should be entered.
             (wait-for-screen-text #$marionette passphrase-prompt?
                                   #:ocrad #$ocrad)
-            (marionette-type "thepassphrase\n" #$marionette)
+            (marionette-type #$(string-append %luks-passphrase "\n")
+                             #$marionette)
 
             ;; Now wait until we leave the boot screen.  This is necessary so
             ;; we can then be sure we match the "Enter passphrase" prompt from
@@ -714,7 +719,8 @@ to enter the LUKS passphrase."
             (wait-for-screen-text #$marionette passphrase-prompt?
                                   #:ocrad #$ocrad
                                   #:timeout 60)
-            (marionette-type "thepassphrase\n" #$marionette)
+            (marionette-type #$(string-append %luks-passphrase "\n")
+                             #$marionette)
 
             ;; Take a screenshot for debugging purposes.
             (marionette-control (string-append "screendump " #$output