me
/
guix
Archived
1
0
Fork 0
Code

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>
Maxim Cournoyer 2023-07-19 10:18:48 -04:00
parent 9542429299
commit 1edbadc6b4
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/tests/vnc.scm
View File

@ -113,7 +113,6 @@
(guix build utils))) (guix build utils)))
#~(begin #~(begin
(use-modules (gnu build marionette) (use-modules (gnu build marionette)
(guix build utils)
(srfi srfi-26) (srfi srfi-26)
(srfi srfi-64)) (srfi srfi-64))
@ -144,11 +143,12 @@
;; check it here. ;; check it here.
(marionette-eval (marionette-eval
'(begin '(begin
(use-modules (guix build utils))
;; Check that DCONF_PROFILE is set... ;; Check that DCONF_PROFILE is set...
(invoke "/bin/sh" "-lc" "\ (invoke "/bin/sh" "-lc" "\
pgrep gdm | head -n1 | xargs -I{} grep -Fq DCONF_PROFILE /proc/{}/environ") 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" "\ (invoke "/bin/sh" "-lc" "\
sudo -E -u gdm env DCONF_PROFILE=/etc/dconf/profile/gdm dbus-run-session \ 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 \ gsettings get org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type \