in common class

canonical · Sep 11, 2023 · 1d30b12 · 1d30b12
1 parent f997d66
commit 1d30b12
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/probert/tests/__init__.py b/probert/tests/__init__.py
@@ -0,0 +1,10 @@
+from unittest import IsolatedAsyncioTestCase
+from unittest.mock import patch
+
+
+class ProbertTestCase(IsolatedAsyncioTestCase):
+    def setUp(self):
+        which = patch("probert.filesystem.shutil.which")
+        self.m_which = which.start()
+        self.m_which.return_value = '/bin/false'
+        self.addCleanup(which.stop)
diff --git a/probert/tests/test_filesystem.py b/probert/tests/test_filesystem.py
@@ -27,6 +27,7 @@
     get_swap_sizing,
     get_device_filesystem,
 )
+from probert.tests import ProbertTestCase
 
 
 def read_file(filename):
@@ -60,8 +61,7 @@ async def test_expected_output_vg(self):
         assert expected == await get_swap_sizing(device)
 
 
-@patch('probert.filesystem.shutil.which', new=Mock(return_value='/bin/false'))
-class TestFilesystem(IsolatedAsyncioTestCase):
+class TestFilesystem(ProbertTestCase):
     def setUp(self):
         self.device = Mock()
         self.device.device_node = random_string()
@@ -198,10 +198,11 @@ async def test_get_device_filesystem_sizing_ext4_no_min(self):
             self.assertEqual(expected, actual)
 
 
-@patch('probert.filesystem.shutil.which', new=Mock(return_value=None))
-class TestFilesystemToolNotFound(IsolatedAsyncioTestCase):
+class TestFilesystemToolNotFound(ProbertTestCase):
     def setUp(self):
+        super().setUp()
         self.device = Mock()
+        self.m_which.return_value = None
 
     async def test_ntfsresize_not_found(self):
         self.assertEqual(None, await get_ntfs_sizing(self.device))