Merge pull request #188 from wmww/fix-tests-sep-2024

Make tests compatible with new libwayland format
wmww · Sep 1, 2024 · 52ed5b6 · 52ed5b6
2 parents 5f71546 + d70baed
commit 52ed5b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/test/integration-tests/test-set-monitor.c b/test/integration-tests/test-set-monitor.c
@@ -15,7 +15,7 @@ static GtkWindow* window;
 
 static void callback_0()
 {
-    EXPECT_MESSAGE(zwlr_layer_shell_v1 .get_layer_surface wl_output@);
+    EXPECT_MESSAGE(zwlr_layer_shell_v1 .get_layer_surface wl_output);
     window = create_default_window();
     gtk_layer_init_for_window(window);
     ASSERT_EQ(gdk_display_get_n_monitors(gdk_display_get_default()), 1, "%d");

diff --git a/test/run-integration-test.py b/test/run-integration-test.py
@@ -218,7 +218,7 @@ def verify_result(lines: List[str]):
     for i, line in enumerate(lines):
         if line.startswith('EXPECT: '):
             assertions.append(line.split()[1:])
-        elif line.startswith('[') and line.endswith(')') and '@' in line:
+        elif line.startswith('[') and line.endswith(')') and ('@' in line or '#' in line):
             if assertions and line_contains(line, assertions[0]):
                 assertions = assertions[1:]
         elif line == 'CHECK EXPECTATIONS COMPLETED' or i == len(lines) - 1: