From 3a7516aadaf864ee9d04727977d3d9fd1bccbbda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= <slyon@ubuntu.com>
Date: Wed, 3 Jul 2024 11:52:06 +0200
Subject: [PATCH]  Increase some test timeouts to account for slow (riscv64)
 buildds

---
 meson.build                     |  2 +-
 tests/netplan_dbus/test_dbus.py | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/meson.build b/meson.build
index 9556836a1..b29174de4 100644
--- a/meson.build
+++ b/meson.build
@@ -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',
diff --git a/tests/netplan_dbus/test_dbus.py b/tests/netplan_dbus/test_dbus.py
index fdfa92f74..04b6fc650 100644
--- a/tests/netplan_dbus/test_dbus.py
+++ b/tests/netplan_dbus/test_dbus.py
@@ -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(), [
@@ -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)
 
@@ -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)
 
@@ -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(), [
@@ -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):
@@ -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):