diff options
author | Bastien Nocera <hadess@hadess.net> | 2022-02-23 15:14:30 +0100 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2022-02-23 15:14:30 +0100 |
commit | fdaafe61606037257124f864d5c0bb882a9a0a3e (patch) | |
tree | 626dbb0acfd6cce347cde72bc5aee3bfba1aee80 | |
parent | 88fd3d36df02b052accd73e3bf9accaddcb41eb9 (diff) | |
download | gnome-bluetooth-fdaafe61606037257124f864d5c0bb882a9a0a3e.tar.gz |
tests: Always start UPower mock
-rwxr-xr-x | tests/integration-test.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/integration-test.py b/tests/integration-test.py index 99d97def..7b0d233e 100755 --- a/tests/integration-test.py +++ b/tests/integration-test.py @@ -449,8 +449,10 @@ class Tests(dbusmock.DBusTestCase): os.environ['G_DEBUG'] = 'fatal_warnings' cls.start_system_bus() cls.dbus_con = cls.get_dbus(True) - (cls.p_mock, cls.obj_bluez) = cls.spawn_server_template( + (cls.p_mock_bluez, cls.obj_bluez) = cls.spawn_server_template( 'bluez5', {}) + (cls.p_mock_upower, cls.obj_upower) = cls.spawn_server_template( + 'upower', {}) cls.exec_path = [sys.argv[0]] cls.exec_dir = builddir + '/tests/' @@ -459,8 +461,10 @@ class Tests(dbusmock.DBusTestCase): @classmethod def tearDownClass(cls): - cls.p_mock.terminate() - cls.p_mock.wait() + cls.p_mock_bluez.terminate() + cls.p_mock_bluez.wait() + cls.p_mock_upower.terminate() + cls.p_mock_upower.wait() def setUp(self): self.obj_bluez.Reset() @@ -565,9 +569,7 @@ class Tests(dbusmock.DBusTestCase): self.run_test_process() def test_battery(self): - (p_mock, obj_upower) = self.spawn_server_template( - 'upower', {}) - mock = dbus.Interface(obj_upower, dbusmock.MOCK_IFACE) + mock = dbus.Interface(self.obj_upower, dbusmock.MOCK_IFACE) self.dbusmock_bluez.AddAdapter('hci0', 'my-computer') @@ -619,8 +621,6 @@ class Tests(dbusmock.DBusTestCase): self.run_test_process() - p_mock.terminate() - p_mock.wait() if __name__ == '__main__': unittest.main() |