diff --git a/tests/fixtures/idle-inhibit.py b/tests/fixtures/idle-inhibit.py index 494524c..4996277 100644 --- a/tests/fixtures/idle-inhibit.py +++ b/tests/fixtures/idle-inhibit.py @@ -1,5 +1,5 @@ """Hold an ephemeral idle inhibition only in the isolated QEMU acceptance VM.""" -import pathlib,subprocess,signal,threading,sys +import pathlib,subprocess,signal,threading,sys,os assert pathlib.Path('/proc/sys/kernel/hostname').read_text().strip()=='uu-hyprland-test' assert subprocess.check_output(['systemd-detect-virt'],text=True).strip()=='qemu' import gi @@ -7,7 +7,11 @@ gi.require_version('Gio','2.0') from gi.repository import Gio,GLib seconds=min(4200,max(1,int(sys.argv[1]) if len(sys.argv)>1 else 3600)) bus=Gio.bus_get_sync(Gio.BusType.SESSION,None) -reply=bus.call_sync('org.freedesktop.ScreenSaver','/ScreenSaver','org.freedesktop.ScreenSaver','Inhibit',GLib.Variant('(ss)',('UU isolated acceptance','Timed live-connection acceptance')),GLib.VariantType.new('(u)'),Gio.DBusCallFlags.NONE,3000,None) +gnome='GNOME' in os.environ.get('XDG_CURRENT_DESKTOP','').upper().split(':') +destination='org.gnome.SessionManager' if gnome else 'org.freedesktop.ScreenSaver' +object_path='/org/gnome/SessionManager' if gnome else '/ScreenSaver' +parameters=GLib.Variant('(susu)',('UU isolated acceptance',0,'Timed live-connection acceptance',8)) if gnome else GLib.Variant('(ss)',('UU isolated acceptance','Timed live-connection acceptance')) +reply=bus.call_sync(destination,object_path,destination,'Inhibit',parameters,GLib.VariantType.new('(u)'),Gio.DBusCallFlags.NONE,3000,None) cookie=reply.unpack()[0] stop=threading.Event() signal.signal(signal.SIGTERM,lambda *_:stop.set()) @@ -16,6 +20,6 @@ print('VM timed idle inhibition acquired',flush=True) try:stop.wait(seconds) finally: try: - bus.call_sync('org.freedesktop.ScreenSaver','/ScreenSaver','org.freedesktop.ScreenSaver','UnInhibit',GLib.Variant('(u)',(cookie,)),None,Gio.DBusCallFlags.NONE,3000,None) + bus.call_sync(destination,object_path,destination,'Uninhibit' if gnome else 'UnInhibit',GLib.Variant('(u)',(cookie,)),None,Gio.DBusCallFlags.NONE,3000,None) print('VM timed idle inhibition released',flush=True) except GLib.Error:print('VM idle inhibition connection closed',flush=True)