1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
|
From: Simon McVittie <smcv@debian.org>
Date: Wed, 13 Dec 2023 10:34:02 +0000
Subject: Mark several additional tests as flaky
Most of these have never been reliable on Debian buildds, especially
on ARM, so having them fail is not a regression. They usually succeed
after a few retries, but that's time-consuming and unsuitable to be a
QA gate.
The input-capture test frequently hangs until it times out, so put that
one in a separate suite so that we don't need to run it at all.
Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: no
---
src/tests/clutter/conform/gesture.c | 24 ++++++++++++++++++++++++
src/tests/clutter/conform/grab.c | 6 ++++++
src/tests/clutter/conform/meson.build | 8 +++++++-
src/tests/meson.build | 16 ++++++++++++++--
src/tests/monitor-tests-common.c | 6 +++++-
src/tests/mtk/meson.build | 1 +
src/tests/mtk/time-utils-tests.c | 6 ++++++
7 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/src/tests/clutter/conform/gesture.c b/src/tests/clutter/conform/gesture.c
index ea2e382..4a59589 100644
--- a/src/tests/clutter/conform/gesture.c
+++ b/src/tests/clutter/conform/gesture.c
@@ -133,6 +133,12 @@ gesture_state_machine_move_to_waiting (void)
ClutterGesture *gesture = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, NULL));
gboolean was_updated;
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("https://gitlab.gnome.org/GNOME/mutter/-/issues/3521");
+ return;
+ }
+
virtual_pointer = clutter_seat_create_virtual_device (seat, CLUTTER_POINTER_DEVICE);
now_us = g_get_monotonic_time ();
@@ -193,6 +199,12 @@ gesture_state_machine_move_to_cancelled_while_possible (void)
gboolean was_updated;
ClutterGestureState gesture_state_change;
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("https://gitlab.gnome.org/GNOME/mutter/-/issues/3521");
+ return;
+ }
+
virtual_pointer = clutter_seat_create_virtual_device (seat, CLUTTER_POINTER_DEVICE);
now_us = g_get_monotonic_time ();
@@ -240,6 +252,12 @@ gesture_state_machine_move_to_cancelled_on_sequence_cancel (void)
gboolean was_updated;
ClutterGestureState gesture_state_change;
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("https://gitlab.gnome.org/GNOME/mutter/-/issues/3521");
+ return;
+ }
+
virtual_pointer = clutter_seat_create_virtual_device (seat, CLUTTER_POINTER_DEVICE);
now_us = g_get_monotonic_time ();
@@ -297,6 +315,12 @@ gesture_multiple_mouse_buttons (void)
ClutterGesture *gesture = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, NULL));
gboolean was_updated;
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("https://gitlab.gnome.org/GNOME/mutter/-/issues/3521");
+ return;
+ }
+
virtual_pointer = clutter_seat_create_virtual_device (seat, CLUTTER_POINTER_DEVICE);
now_us = g_get_monotonic_time ();
diff --git a/src/tests/clutter/conform/grab.c b/src/tests/clutter/conform/grab.c
index 93a8cf4..9018a53 100644
--- a/src/tests/clutter/conform/grab.c
+++ b/src/tests/clutter/conform/grab.c
@@ -620,6 +620,12 @@ grab_input_only (void)
ClutterSeat *seat;
g_autoptr (ClutterVirtualInputDevice) pointer = NULL;
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("https://gitlab.gnome.org/GNOME/mutter/-/issues/3205");
+ return;
+ }
+
seat = clutter_test_get_default_seat ();
pointer = clutter_seat_create_virtual_device (seat, CLUTTER_POINTER_DEVICE);
diff --git a/src/tests/clutter/conform/meson.build b/src/tests/clutter/conform/meson.build
index 7cb80a2..8e95bc6 100644
--- a/src/tests/clutter/conform/meson.build
+++ b/src/tests/clutter/conform/meson.build
@@ -70,6 +70,12 @@ test_env.set('GSETTINGS_SCHEMA_DIR', locally_compiled_schemas_dir)
test_env.set('TEST_DATADIR', mutter_srcdir / 'src' / 'tests')
foreach test : clutter_conform_tests
+ extra_suites = []
+
+ if test == 'timeline' or test == 'timeline-interpolate'
+ extra_suites += 'flaky'
+ endif
+
test_executable = executable('@0@'.format(test),
sources: [
'@0@.c'.format(test),
@@ -85,7 +91,7 @@ foreach test : clutter_conform_tests
)
test(test, test_executable,
- suite: ['clutter', 'clutter/conform'],
+ suite: ['clutter', 'clutter/conform'] + extra_suites,
env: test_env,
is_parallel: false,
)
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 1e0c048..8c985d8 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -658,6 +658,7 @@ test_cases += [
'name': 'input-capture',
'suite': 'backends/native',
'sources': [ 'input-capture-tests.c' ],
+ 'broken': true,
},
{
'name': 'thread',
@@ -1081,9 +1082,20 @@ foreach test_case: test_cases
args = test_case.get('args', [])
+
+ extra_suites = []
+
+ if test_case.get('flaky', false)
+ extra_suites += 'flaky'
+ endif
+
+ if test_case.get('broken', false)
+ extra_suites += 'broken'
+ endif
+
message('test @0@ args: @1@'.format(test_case['name'], args))
test(test_case['name'], test_executable,
- suite: ['core', 'mutter/' + test_case['suite']],
+ suite: ['core', 'mutter/' + test_case['suite']] + extra_suites,
args: args,
env: test_env,
depends: test_depends,
@@ -1163,7 +1175,7 @@ stacking_tests = [
foreach stacking_test: stacking_tests
test(stacking_test, test_runner,
- suite: ['core', 'mutter/stacking'],
+ suite: ['core', 'mutter/stacking', 'flaky'],
env: test_env,
args: [
files('stacking' / stacking_test + '.metatest'),
diff --git a/src/tests/monitor-tests-common.c b/src/tests/monitor-tests-common.c
index d03fecf..46f04b9 100644
--- a/src/tests/monitor-tests-common.c
+++ b/src/tests/monitor-tests-common.c
@@ -226,7 +226,11 @@ meta_check_monitor_test_clients_state (void)
{
meta_check_test_client_state (wayland_monitor_test_client);
meta_check_test_client_state (x11_monitor_test_client);
- check_test_client_x11_state (x11_monitor_test_client);
+
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ g_test_skip ("https://gitlab.gnome.org/GNOME/mutter/-/issues/4200");
+ else
+ check_test_client_x11_state (x11_monitor_test_client);
}
static MetaMonitorTestSetup *
diff --git a/src/tests/mtk/meson.build b/src/tests/mtk/meson.build
index 4e21b2f..d372d2d 100644
--- a/src/tests/mtk/meson.build
+++ b/src/tests/mtk/meson.build
@@ -30,6 +30,7 @@ test_cases += [
{
'name': 'mtk-time-utils',
'suite': 'unit',
+ 'flaky': true,
'sources': [
'mtk/time-utils-tests.c',
]
diff --git a/src/tests/mtk/time-utils-tests.c b/src/tests/mtk/time-utils-tests.c
index 792f82d..704dcb3 100644
--- a/src/tests/mtk/time-utils-tests.c
+++ b/src/tests/mtk/time-utils-tests.c
@@ -28,6 +28,12 @@ test_extrapolate_interval_boundary (void)
int64_t now_us;
int64_t next_interval_boundary_us;
+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+ {
+ g_test_skip ("https://gitlab.gnome.org/GNOME/mutter/-/issues/4199");
+ return;
+ }
+
now_us = g_get_monotonic_time ();
next_interval_boundary_us =
|
