tests/wm: ensure correct gdk backend

Author: amezin

test/dbus-interfaces/com.github.amezin.ddterm.TestHook.xml

@@ -15,6 +15,7 @@
         <property type="b" name="WindowAbove" access="read"/>
         <property type="b" name="WindowSkipTaskbar" access="read"/>
         <property type="b" name="WindowOnAllWorkspaces" access="read"/>
+        <property type="s" name="ClientType" access="read"/>
 
         <method name="Destroy"/>
 

test/extensionhook.js

@@ -1,6 +1,7 @@
 import GLib from 'gi://GLib';
 import GObject from 'gi://GObject';
 import Gio from 'gi://Gio';
+import Meta from 'gi://Meta';
 import Shell from 'gi://Shell';
 
 import {
@@ -154,6 +155,7 @@ const Interface = GObject.registerClass({
                 this.HasWindow = false;
                 this.MaximizedHorizontally = false;
                 this.MaximizedVertically = false;
+                this.ClientType = '';
                 this._update_window_rect();
 
                 return;
@@ -268,6 +270,11 @@ const Interface = GObject.registerClass({
                 ]));
             }));
 
+            this.ClientType = {
+                [Meta.WindowClientType.WAYLAND]: 'wayland',
+                [Meta.WindowClientType.X11]: 'x11',
+            }[win.get_client_type()];
+
             this.HasWindow = true;
         } finally {
             this.thaw_notify();

test/test_wm.py

@@ -255,36 +255,6 @@ def monitor_config(
 
         return monitor_layout
 
-    @pytest.fixture
-    def gdk_backend(
-        self,
-        request,
-        dbus_connection,
-        extension_test_hook,
-        settings_test_hook,
-        app_dbus_actions
-    ):
-        force_x11 = request.param == GdkBackend.X11
-
-        # Make sure cached value is up to date
-        glibutil.dispatch_pending_sources()
-
-        if settings_test_hook.force_x11_gdk_backend == force_x11:
-            return request.param
-
-        settings_test_hook.force_x11_gdk_backend = force_x11
-
-        if extension_test_hook.AppRunning:
-            app_dbus_actions.activate_action('quit', None)
-
-            extension_test_hook.wait_property(
-                'AppRunning',
-                False,
-                timeout=dbusutil.DEFAULT_LONG_TIMEOUT_MS
-            )
-
-        return request.param
-
     @pytest.fixture
     def window_size(self, settings_test_hook, request):
         settings_test_hook.window_size = request.param
@@ -447,12 +417,14 @@ def test_show(
         extension_test_hook,
         shell_test_hook,
         wait_idle,
+        gdk_backend,
     ):
         extension_dbus_interface.Activate(timeout=dbusutil.DEFAULT_LONG_TIMEOUT_MS)
         glibutil.dispatch_pending_sources()
 
         assert extension_test_hook.HasWindow
         assert unmaximized_rect == extension_dbus_interface.TargetRect
+        assert extension_test_hook.ClientType == gdk_backend
 
         extension_test_hook.wait_property('RenderedFirstFrame', True)
         wait_idle()
@@ -533,12 +505,14 @@ def test_maximize_unmaximize(
         settings_test_hook,
         shell_test_hook,
         wait_idle,
+        gdk_backend,
     ):
         extension_dbus_interface.Activate(timeout=dbusutil.DEFAULT_LONG_TIMEOUT_MS)
         glibutil.dispatch_pending_sources()
 
         assert extension_test_hook.HasWindow
         assert unmaximized_rect == extension_dbus_interface.TargetRect
+        assert extension_test_hook.ClientType == gdk_backend
 
         extension_test_hook.wait_property('RenderedFirstFrame', True)
         wait_idle()
@@ -584,12 +558,14 @@ def test_mouse_resize(
         extension_test_hook,
         shell_test_hook,
         wait_idle,
+        gdk_backend,
     ):
         extension_dbus_interface.Activate(timeout=dbusutil.DEFAULT_LONG_TIMEOUT_MS)
         glibutil.dispatch_pending_sources()
 
         assert extension_test_hook.HasWindow
         assert unmaximized_rect == extension_dbus_interface.TargetRect
+        assert extension_test_hook.ClientType == gdk_backend
 
         extension_test_hook.wait_property('RenderedFirstFrame', True)
         wait_idle()
@@ -642,6 +618,7 @@ def test_resize_maximize_unmaximize(
         settings_test_hook,
         shell_test_hook,
         wait_idle,
+        gdk_backend,
     ):
         settings_test_hook.window_maximize = False
 
@@ -650,6 +627,7 @@ def test_resize_maximize_unmaximize(
 
         assert extension_test_hook.HasWindow
         assert unmaximized_rect == extension_dbus_interface.TargetRect
+        assert extension_test_hook.ClientType == gdk_backend
 
         wait_idle()
 
@@ -737,6 +715,12 @@ def monitor_layout(self, layout_mode, monitor0_scale, monitor1_scale):
 
         return (displayconfig.SimpleMonitorConfig(scale=monitor0_scale),)
 
+    @pytest.fixture
+    def gdk_backend(self, request):
+        assert request.param == GdkBackend.X11
+
+        return request.param
+
 
 class TestWayland(CommonTests, fixtures.GnomeSessionWaylandFixtures):
     @pytest.fixture
@@ -759,6 +743,36 @@ def expected_show_transitions(
 
         return animation_mode.expected_transitions(window_position)
 
+    @pytest.fixture
+    def gdk_backend(
+        self,
+        request,
+        dbus_connection,
+        extension_test_hook,
+        settings_test_hook,
+        app_dbus_actions
+    ):
+        force_x11 = request.param == GdkBackend.X11
+
+        # Make sure cached value is up to date
+        glibutil.dispatch_pending_sources()
+
+        if settings_test_hook.force_x11_gdk_backend == force_x11:
+            return request.param
+
+        if extension_test_hook.AppRunning:
+            app_dbus_actions.activate_action('quit', None)
+
+            extension_test_hook.wait_property(
+                'AppRunning',
+                False,
+                timeout=dbusutil.DEFAULT_LONG_TIMEOUT_MS
+            )
+
+        settings_test_hook.force_x11_gdk_backend = force_x11
+
+        return request.param
+
 
 class TestWaylandTwoMonitors(TestWayland):
     @pytest.fixture