[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: tests: xvnc: Fix 'gdm auto-suspend is disabled' test.
From: |
guix-commits |
Subject: |
04/05: tests: xvnc: Fix 'gdm auto-suspend is disabled' test. |
Date: |
Wed, 19 Jul 2023 10:41:23 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 1edbadc6b49adda050a87057e6501c961888d7bb
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Jul 19 10:18:48 2023 -0400
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>
---
gnu/tests/vnc.scm | 4 ++--
1 file 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 \