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: Make class cleanup more robust

Browse Source 
Use addClassCleanup rather than doing cleanup in tearDownClass, which
may not be called in all cases.
This commit is contained in:
Benjamin Berg
2021-08-25 15:22:42 +02:00
parent e6fc854a9a
commit 717a919996
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/fprintd.py
View File

@ -201,6 +201,7 @@ class FPrintdTest(dbusmock.DBusTestCase):
cls.tmpdir = tempfile.mkdtemp(prefix='libfprint-') cls.tmpdir = tempfile.mkdtemp(prefix='libfprint-')
cls.addClassCleanup(shutil.rmtree, cls.tmpdir)
cls.sockaddr = os.path.join(cls.tmpdir, 'virtual-image.socket') cls.sockaddr = os.path.join(cls.tmpdir, 'virtual-image.socket')
os.environ[cls.socket_env] = cls.sockaddr os.environ[cls.socket_env] = cls.sockaddr
@ -213,6 +214,7 @@ class FPrintdTest(dbusmock.DBusTestCase):
cls.test_bus = Gio.TestDBus.new(Gio.TestDBusFlags.NONE) cls.test_bus = Gio.TestDBus.new(Gio.TestDBusFlags.NONE)
cls.test_bus.up() cls.test_bus.up()
cls.addClassCleanup(cls.test_bus.down)
cls.test_bus.unset() cls.test_bus.unset()
addr = cls.test_bus.get_bus_address() addr = cls.test_bus.get_bus_address()
os.environ['DBUS_SYSTEM_BUS_ADDRESS'] = addr os.environ['DBUS_SYSTEM_BUS_ADDRESS'] = addr
@ -220,16 +222,14 @@ class FPrintdTest(dbusmock.DBusTestCase):
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
cls.addClassCleanup(cls.dbus.close)
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
cls.dbus.close()
cls.test_bus.down()
del cls.dbus
del cls.test_bus
shutil.rmtree(cls.tmpdir)
dbusmock.DBusTestCase.tearDownClass() dbusmock.DBusTestCase.tearDownClass()
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