Skip to content

Commit 3a7516a

Browse files
slyondaniloegea
authored andcommitted
Increase some test timeouts to account for slow (riscv64) buildds
1 parent 554cb87 commit 3a7516a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ test('documentation',
8989
workdir: meson.current_source_dir())
9090
test('legacy-tests',
9191
find_program('tests/cli_legacy.py'),
92-
timeout: 600,
92+
timeout: 900,
9393
env: test_env)
9494
#TODO: split out dbus tests into own test() instance, to run in parallel
9595
test('unit-tests',

tests/netplan_dbus/test_dbus.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def test_netplan_apply_in_snap_calls_busctl(self):
132132
exe_cli + ["apply"],
133133
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
134134
env=newenv)
135-
p.wait(10)
135+
p.wait(20)
136136
self.assertEqual(p.stdout.read(), b"")
137137
self.assertEqual(p.stderr.read(), b"")
138138
self.assertEqual(self.mock_busctl_cmd.calls(), [
@@ -153,7 +153,7 @@ def test_netplan_apply_in_snap_calls_busctl_ret130(self):
153153
exe_cli + ["apply"],
154154
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
155155
env=newenv)
156-
p.wait(10)
156+
p.wait(20)
157157
# exit_on_error is True by default, so we check the returncode directly
158158
self.assertEqual(p.returncode, 130)
159159

@@ -166,7 +166,7 @@ def test_netplan_apply_in_snap_calls_busctl_err(self):
166166
exe_cli + ["apply"],
167167
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
168168
env=newenv)
169-
p.wait(10)
169+
p.wait(20)
170170
# exit_on_error is True by default, so we check the returncode directly
171171
self.assertEqual(p.returncode, 1)
172172

@@ -178,7 +178,7 @@ def test_netplan_generate_in_snap_calls_busctl(self):
178178
exe_cli + ["generate"],
179179
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
180180
env=newenv)
181-
p.wait(10)
181+
p.wait(20)
182182
self.assertEqual(p.stdout.read(), b"")
183183
self.assertEqual(p.stderr.read(), b"")
184184
self.assertEqual(self.mock_busctl_cmd.calls(), [
@@ -199,7 +199,7 @@ def test_netplan_generate_in_snap_calls_busctl_ret130(self):
199199
exe_cli + ["generate"],
200200
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
201201
env=newenv)
202-
p.wait(10)
202+
p.wait(20)
203203
self.assertIn(b"PermissionError: failed to communicate with dbus service", p.stderr.read())
204204

205205
def test_netplan_generate_in_snap_calls_busctl_err(self):
@@ -211,7 +211,7 @@ def test_netplan_generate_in_snap_calls_busctl_err(self):
211211
exe_cli + ["generate"],
212212
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
213213
env=newenv)
214-
p.wait(10)
214+
p.wait(20)
215215
self.assertIn(b"RuntimeError: failed to communicate with dbus service: error 1", p.stderr.read())
216216

217217
def test_netplan_dbus_noroot(self):

0 commit comments

Comments
 (0)