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

tests: Use dbusmock start_system_bus instead of GLib server

Browse Source
This commit is contained in:
Benjamin Berg
2021-08-26 14:23:15 +02:00
committed by Benjamin Berg
parent 0cf0fea902
commit b440acb57d
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/fprintd.py
View File

@ -211,14 +211,8 @@ class FPrintdTest(dbusmock.DBusTestCase):
n = os.path.basename(f)[:-4] n = os.path.basename(f)[:-4]
cls.prints[n] = load_image(f) cls.prints[n] = load_image(f)
cls.start_system_bus()
cls.test_bus = Gio.TestDBus.new(Gio.TestDBusFlags.NONE) cls.dbus = Gio.DBusConnection.new_for_address_sync(os.environ['DBUS_SYSTEM_BUS_ADDRESS'],
cls.test_bus.up()
cls.addClassCleanup(cls.test_bus.down)
cls.test_bus.unset()
addr = cls.test_bus.get_bus_address()
os.environ['DBUS_SYSTEM_BUS_ADDRESS'] = addr
cls.dbus = Gio.DBusConnection.new_for_address_sync(addr,
Gio.DBusConnectionFlags.MESSAGE_BUS_CONNECTION | Gio.DBusConnectionFlags.MESSAGE_BUS_CONNECTION |
Gio.DBusConnectionFlags.AUTHENTICATION_CLIENT, None, None) Gio.DBusConnectionFlags.AUTHENTICATION_CLIENT, None, None)
assert cls.dbus.is_closed() == False assert cls.dbus.is_closed() == False
@ -229,7 +223,6 @@ class FPrintdTest(dbusmock.DBusTestCase):
dbusmock.DBusTestCase.tearDownClass() dbusmock.DBusTestCase.tearDownClass()
del cls.dbus del cls.dbus
del cls.test_bus
def daemon_start(self, driver='Virtual image device for debugging'): def daemon_start(self, driver='Virtual image device for debugging'):
timeout = get_timeout('daemon_start') # seconds timeout = get_timeout('daemon_start') # seconds
@ -373,6 +366,10 @@ class FPrintdTest(dbusmock.DBusTestCase):
self._async_call_res = {} self._async_call_res = {}
os.environ['FP_DRIVERS_WHITELIST'] = self.device_driver os.environ['FP_DRIVERS_WHITELIST'] = self.device_driver
# Always start fake polkitd because of
# https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/95
self.polkitd_start()
def assertFprintError(self, fprint_error): def assertFprintError(self, fprint_error):
if isinstance(fprint_error, list) or isinstance(fprint_error, tuple): if isinstance(fprint_error, list) or isinstance(fprint_error, tuple):
fprint_error = [ re.escape(e) for e in fprint_error ] fprint_error = [ re.escape(e) for e in fprint_error ]
@ -609,7 +606,6 @@ class FPrintdVirtualDeviceBaseTest(FPrintdVirtualImageDeviceBaseTests):
self.manager = None self.manager = None
self.device = None self.device = None
self.polkitd_start()
fifo_path = os.path.join(self.tmpdir, 'logind_inhibit_fifo') fifo_path = os.path.join(self.tmpdir, 'logind_inhibit_fifo')
os.mkfifo(fifo_path) os.mkfifo(fifo_path)