Improved logic to wait for GNOME Shell, fixed screenshot path

Author: Thesola10

tests/features/environment.py

@@ -20,7 +20,7 @@ def _gjs_cmdline(self, code):
         SHELL_DBUS = "org.gnome.Shell"
         SHELL_OBJECT = "/org/gnome/Shell"
         EVAL_DBUS = "org.gnome.Shell.Eval"
-        code_full = f''' paperwm = Main.extensionManager.lookup("paperwm@paperwm.github.com").stateObj; {code} '''
+        code_full = f''' let paperwm = Main.extensionManager.lookup("paperwm@paperwm.github.com").stateObj; {code} '''
         esc_code = code_full.replace('"', '\\"').replace('`', '\\`')
         return f"sudo -u user gdbus call -a unix:path=/run/user/1000/bus -d {SHELL_DBUS} --object-path {SHELL_OBJECT} --method {EVAL_DBUS} \"{esc_code}\""
 
@@ -32,13 +32,18 @@ def libinput_play(self, recording):
 
     def gjs_eval(self, code):
         ''' Execute the specified GJS code from within the GNOME Shell process.
+        Will raise Exception in the event of a GJS error.
         '''
-        return self.machine.succeed(self._gjs_cmdline(code))
+        result = eval(self.machine.succeed(self._gjs_cmdline(code)))
+        if result[0]:
+            return result[1]
+        else:
+            raise Exception(result[1])
 
     def wait_for_paperwm(self):
         ''' Wait until GNOME Shell is able to yield PaperWM internal state.
         '''
-        return self.machine.wait_until_succeeds(self._gjs_cmdline('paperwm.findModule("tiling").spaces._initDone'))
+        return self.machine.wait_until_succeeds(self._gjs_cmdline('paperwm.findModule("tiling").spaces._initDone') + "| grep \"(true, 'true')\"")
 
     def screenshot(self):
         ''' Take a screenshot and load it as an OpenCV-compatible representation

tests/features/steps/visual.py

@@ -7,12 +7,12 @@
 @then("the screen should match {image}")
 def scrcompare_simple(context, image):
     screen = context.nixos.screenshot()
-    template = cv2.imread(Path(context.config.base_dir) / "screenshots" / f"{image}.png")
+    template = cv2.imread(Path(context.config.base_dir).parent.resolve() / "screenshots" / f"{image}.png")
 
     res = cv2.matchTemplate(screen, template, cv2.TM_CCOEFF_NORMED)
     threshold = 0.90
-    loc = np.whre(res >= threshold)
+    loc = np.where(res >= threshold)
 
     print(loc)
 
-    assert(len(loc[0]) > 0, "No match found.")
+    assert len(loc[0]) > 0, "No match found."

tests/screenshots/basic.png

@@ -66,4 +66,9 @@
   { enable = true;
     extraConfig = "%wheel ALL=(ALL) NOPASSWD: ALL";
   };
+
+  ### Switch to VirtIO emulated GPU
+  virtualisation.qemu.options = [
+    "-vga virtio"
+  ];
 }