Skip to content

Commit

Permalink
Increase some test timeouts to account for slow (riscv64) buildds
Browse files Browse the repository at this point in the history
  • Loading branch information
slyon authored and daniloegea committed Jul 3, 2024
1 parent 554cb87 commit 3a7516a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ test('documentation',
workdir: meson.current_source_dir())
test('legacy-tests',
find_program('tests/cli_legacy.py'),
timeout: 600,
timeout: 900,
env: test_env)
#TODO: split out dbus tests into own test() instance, to run in parallel
test('unit-tests',
Expand Down
12 changes: 6 additions & 6 deletions tests/netplan_dbus/test_dbus.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def test_netplan_apply_in_snap_calls_busctl(self):
exe_cli + ["apply"],
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
env=newenv)
p.wait(10)
p.wait(20)
self.assertEqual(p.stdout.read(), b"")
self.assertEqual(p.stderr.read(), b"")
self.assertEqual(self.mock_busctl_cmd.calls(), [
Expand All @@ -153,7 +153,7 @@ def test_netplan_apply_in_snap_calls_busctl_ret130(self):
exe_cli + ["apply"],
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
env=newenv)
p.wait(10)
p.wait(20)
# exit_on_error is True by default, so we check the returncode directly
self.assertEqual(p.returncode, 130)

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

Expand All @@ -178,7 +178,7 @@ def test_netplan_generate_in_snap_calls_busctl(self):
exe_cli + ["generate"],
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
env=newenv)
p.wait(10)
p.wait(20)
self.assertEqual(p.stdout.read(), b"")
self.assertEqual(p.stderr.read(), b"")
self.assertEqual(self.mock_busctl_cmd.calls(), [
Expand All @@ -199,7 +199,7 @@ def test_netplan_generate_in_snap_calls_busctl_ret130(self):
exe_cli + ["generate"],
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
env=newenv)
p.wait(10)
p.wait(20)
self.assertIn(b"PermissionError: failed to communicate with dbus service", p.stderr.read())

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

def test_netplan_dbus_noroot(self):
Expand Down

0 comments on commit 3a7516a

Please sign in to comment.