From 33ffadf402617e06698665fed67daa357a579af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sun, 24 Jan 2021 19:54:12 +0100 Subject: [PATCH] tests/virtual-device: Cleanup device storage on teardown --- tests/virtual-device.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/virtual-device.py b/tests/virtual-device.py index c31de257..44664d7d 100644 --- a/tests/virtual-device.py +++ b/tests/virtual-device.py @@ -356,6 +356,10 @@ class VirtualDevice(unittest.TestCase): class VirtualDeviceStorage(VirtualDevice): + def tearDown(self): + self.cleanup_device_storage() + super().tearDown() + def cleanup_device_storage(self): for print in self.dev.list_prints_sync(): self.assertTrue(self.dev.delete_print_sync(print, None)) @@ -373,17 +377,14 @@ class VirtualDeviceStorage(VirtualDevice): self.assertTrue(self.dev.has_storage()) def test_list_empty(self): - self.cleanup_device_storage() self.assertFalse(self.dev.list_prints_sync()) def test_list_populated(self): - self.cleanup_device_storage() self.send_command('INSERT', 'p1') print2 = self.enroll_print('p2', FPrint.Finger.LEFT_LITTLE) self.assertEqual({'p1', 'p2'}, {p.props.fpi_data.get_string() for p in self.dev.list_prints_sync()}) def test_list_delete(self): - self.cleanup_device_storage() p = self.enroll_print('testprint', FPrint.Finger.RIGHT_THUMB) l = self.dev.list_prints_sync() print(l[0]) @@ -394,7 +395,6 @@ class VirtualDeviceStorage(VirtualDevice): self.assertFalse(self.dev.list_prints_sync()) def test_list_delete_missing(self): - self.cleanup_device_storage() p = self.enroll_print('testprint', FPrint.Finger.RIGHT_THUMB) self.send_command('REMOVE', 'testprint')