cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-09 12:23:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

tests/fprintd: Use a new bus for each test unit

Browse Source 
When creating a new unit we used to get the system bus via Gio.bus_get_sync,
however this has a singleton implementation, and so would always return the
same connection, creating issues in tests when a new test suite is added
because the newly got connection would be already closed.

So, just manually create a new bus connection, also close the bus and
cleanup the test bus in dbus.
This commit is contained in:
Marco Trevisan (Treviño)
2020-02-07 17:44:46 +01:00
committed by Bastien Nocera
parent b2ad590891
commit 06480c7994
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/fprintd.py
View File

@ -1,5 +1,6 @@
#! /usr/bin/env python3 #! /usr/bin/env python3
# Copyright © 2017, 2019 Red Hat, Inc # Copyright © 2017, 2019 Red Hat, Inc
# Copyright © 2020 Canonical Ltd
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -157,12 +158,19 @@ class FPrintdTest(dbusmock.DBusTestCase):
del os.environ['DBUS_SESSION_BUS_ADDRESS'] del os.environ['DBUS_SESSION_BUS_ADDRESS']
except KeyError: except KeyError:
pass pass
os.environ['DBUS_SYSTEM_BUS_ADDRESS'] = cls.test_bus.get_bus_address() addr = cls.test_bus.get_bus_address()
cls.dbus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None) os.environ['DBUS_SYSTEM_BUS_ADDRESS'] = addr
cls.dbus = Gio.DBusConnection.new_for_address_sync(addr,
Gio.DBusConnectionFlags.MESSAGE_BUS_CONNECTION |
Gio.DBusConnectionFlags.AUTHENTICATION_CLIENT, None, None)
assert cls.dbus.is_closed() == False
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
cls.dbus.close()
cls.test_bus.down() cls.test_bus.down()
del cls.dbus
del cls.test_bus
shutil.rmtree(cls.tmpdir) shutil.rmtree(cls.tmpdir)
dbusmock.DBusTestCase.tearDownClass() dbusmock.DBusTestCase.tearDownClass()