summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-07-19 10:18:48 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-07-19 10:38:15 -0400
commit1edbadc6b49adda050a87057e6501c961888d7bb (patch)
treee458c0d4a84c1ebaf5e1c5c0cd295caff950e05c
parent95424292993551854fb7373cef997fd39340ea4b (diff)
downloadguix-1edbadc6b49adda050a87057e6501c961888d7bb.tar.gz
tests: xvnc: Fix 'gdm auto-suspend is disabled' test.
This failure is another collateral from commit a09c7da ("tests: Fork and exec
a new Guile for the marionette REPL."), which isolated the marionette
evaluation environment from that of the host.

* gnu/tests/vnc.scm (run-xvnc-test): Move the (guix build utils) import to...
["gdm auto-suspend is disabled"]: ... inside the marionette-eval of this
test.  Complete comment.

Reported-by: Bruno Victal <mirai@makinata.eu>
-rw-r--r--gnu/tests/vnc.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/tests/vnc.scm b/gnu/tests/vnc.scm
index a34bc466b7..ab1c2749f3 100644
--- a/gnu/tests/vnc.scm
+++ b/gnu/tests/vnc.scm
@@ -113,7 +113,6 @@
                               (guix build utils)))
       #~(begin
           (use-modules (gnu build marionette)
-                       (guix build utils)
                        (srfi srfi-26)
                        (srfi srfi-64))
 
@@ -144,11 +143,12 @@
               ;; check it here.
               (marionette-eval
                '(begin
+                  (use-modules (guix build utils))
                   ;; Check that DCONF_PROFILE is set...
                   (invoke "/bin/sh" "-lc" "\
 pgrep gdm | head -n1 | xargs -I{} grep -Fq DCONF_PROFILE /proc/{}/environ")
 
-                  ;; ... and that
+                  ;; ... and that 'sleep-inactive-ac-type' is unset.
                   (invoke "/bin/sh" "-lc" "\
 sudo -E -u gdm env DCONF_PROFILE=/etc/dconf/profile/gdm dbus-run-session \
 gsettings get org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type \