tests: test mixed-dpi configuration

#167
ddterm · Nov 30, 2022 · 071d7c3 · 071d7c3
1 parent 67a199f
commit 071d7c3
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 2 deletions.
diff --git a/test/etc/systemd/user/[email protected]/mutter-mixed-dpi.conf b/test/etc/systemd/user/[email protected]/mutter-mixed-dpi.conf
@@ -0,0 +1,4 @@
+[Service]
+Environment="MUTTER_DEBUG_NUM_DUMMY_MONITORS=2"
+Environment="[email protected]"
+Environment="MUTTER_DEBUG_DUMMY_MONITOR_SCALES=2,1"
diff --git a/test/extension/extension.js b/test/extension/extension.js
@@ -594,6 +594,18 @@ function wait_move_resize(
     });
 }
 
+function is_mixed_dpi() {
+    let scales = [];
+
+    for (let i = 0; i < global.display.get_n_monitors(); i++) {
+        const scale = global.display.get_monitor_scale(i);
+        if (!scales.includes(scale))
+            scales.push(scale);
+    }
+
+    return scales.length > 1;
+}
+
 async function test_show(
     window_size,
     window_maximize,
@@ -636,19 +648,26 @@ async function test_show(
     const settings_maximize = settings.get_boolean('window-maximize');
     const should_maximize =
         window_maximize === WindowMaximizeMode.EARLY || (window_size === 1.0 && settings_maximize);
+    const mixed_dpi_penalty = is_mixed_dpi() ? 2 : 0;
 
     await wait_move_resize(
         window_size,
         should_maximize,
         window_pos,
         monitor_index,
-        prev_maximize === should_maximize ? 0 : 1
+        (prev_maximize === should_maximize ? 0 : 1) + mixed_dpi_penalty
     );
 
     verify_window_geometry(window_size, should_maximize, window_pos, monitor_index);
 
     if (window_maximize === WindowMaximizeMode.LATE) {
-        const geometry_wait = wait_move_resize(window_size, true, window_pos, monitor_index, 1);
+        const geometry_wait = wait_move_resize(
+            window_size,
+            true,
+            window_pos,
+            monitor_index,
+            1 + mixed_dpi_penalty
+        );
 
         await set_settings_boolean('window-maximize', true);
 

diff --git a/test/test_extension.py b/test/test_extension.py
@@ -331,6 +331,7 @@ def test_show_v(
         window_maximize,
         window_pos,
         monitor_config,
+        shell_version,
         screenshot
     ):
         with screenshot:
@@ -350,6 +351,7 @@ def test_show_h(
         window_maximize,
         window_pos,
         monitor_config,
+        shell_version,
         screenshot
     ):
         with screenshot:
@@ -556,6 +558,47 @@ def mount_configs(cls):
         ]
 
 
+class TestWaylandMixedDPI(DualMonitorTests, SmallScreenMixin):
+    GNOME_SHELL_SESSION_NAME = 'gnome-wayland-nested'
+
+    @classmethod
+    def mount_configs(cls):
+        return super().mount_configs() + [
+            '/etc/systemd/user/[email protected]/mutter-mixed-dpi.conf'
+        ]
+
+    @functools.wraps(CommonTests.test_show_v)
+    def test_show_v(self, *args, shell_version, **kwargs):
+        if shell_version < (42, 0):
+            pytest.skip('Mixed DPI is not supported before GNOME Shell 42')
+
+        super().test_show_v(*args, shell_version=shell_version, **kwargs)
+
+    @pytest.mark.skip
+    def test_show_h(self, monitor_config):
+        pass
+
+    @pytest.mark.skip
+    def test_resize_xte(self, monitor_config):
+        pass
+
+    @pytest.mark.skip
+    def test_change_position(self, monitor_config):
+        pass
+
+    @pytest.mark.skip
+    def test_unmaximize(self, monitor_config):
+        pass
+
+    @pytest.mark.skip
+    def test_unmaximize_correct_size(self, monitor_config):
+        pass
+
+    @pytest.mark.skip
+    def test_unmaximize_on_size_change(self, monitor_config):
+        pass
+
+
 def wait_action_in_group(group, action):
     with glib_util.SignalWait(group, f'action-added::{action}') as w:
         while not group.has_action(action):