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: Better cleanup helper processes and objects

Browse Source 
We were leaking the bus connections for the proxy objects. Also, now the
subprocesses will be forcefully killed at shutdown.
This commit is contained in:
Benjamin Berg
2021-08-26 14:25:12 +02:00
committed by Benjamin Berg
parent b3d6bf0825
commit 0cf0fea902
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/fprintd.py
View File

@ -250,6 +250,7 @@ class FPrintdTest(dbusmock.DBusTestCase):
self.valgrind = True self.valgrind = True
self.kill_daemon = False self.kill_daemon = False
self.daemon_log = OutputChecker() self.daemon_log = OutputChecker()
self.addCleanup(self.daemon_log.force_close)
self.daemon = subprocess.Popen(argv, self.daemon = subprocess.Popen(argv,
env=env, env=env,
stdout=self.daemon_log.fd, stdout=self.daemon_log.fd,
@ -337,14 +338,23 @@ class FPrintdTest(dbusmock.DBusTestCase):
self._polkitd, self._polkitd_obj = self.spawn_server_template( self._polkitd, self._polkitd_obj = self.spawn_server_template(
polkitd_template, {}, stdout=subprocess.PIPE) polkitd_template, {}, stdout=subprocess.PIPE)
self.addCleanup(self.stop_server, '_polkitd', '_polkitd_obj')
return self._polkitd return self._polkitd
def polkitd_stop(self): def stop_server(self, proc_attr, obj_attr):
if self._polkitd is None: proc = getattr(self, proc_attr, None)
if proc is None:
return return
self._polkitd.terminate()
self._polkitd.wait() proc.terminate()
try:
proc.wait(timeout=1)
except subprocess.TimeoutExpired as e:
proc.kill()
delattr(self, proc_attr)
delattr(self, obj_attr)
def polkitd_allow_all(self): def polkitd_allow_all(self):
self._polkitd_obj.SetAllowed([FprintDevicePermission.set_username, self._polkitd_obj.SetAllowed([FprintDevicePermission.set_username,
@ -600,7 +610,6 @@ class FPrintdVirtualDeviceBaseTest(FPrintdVirtualImageDeviceBaseTests):
self.manager = None self.manager = None
self.device = None self.device = None
self.polkitd_start() self.polkitd_start()
self.addCleanup(self.polkitd_stop)
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)
@ -615,6 +624,7 @@ class FPrintdVirtualDeviceBaseTest(FPrintdVirtualImageDeviceBaseTests):
'ret = os.open("%s", os.O_WRONLY)\n' % fifo_path + 'ret = os.open("%s", os.O_WRONLY)\n' % fifo_path +
'from gi.repository import GLib\n' + 'from gi.repository import GLib\n' +
'GLib.idle_add(lambda fd: os.close(fd), ret)') 'GLib.idle_add(lambda fd: os.close(fd), ret)')
self.addCleanup(self.stop_server, 'logind', 'logind_obj')
self.daemon_start(self.driver_name) self.daemon_start(self.driver_name)
self.wait_got_delay_inhibitor(timeout=5) self.wait_got_delay_inhibitor(timeout=5)