test: patch where an object is looked up

This allows mocking getMemoryBounds to work as expected. Also clean up unsed MockBuiltinRead. Signed-off-by: Coiby Xu <[email protected]>
rhinstaller · Oct 20, 2023 · 8f61cc1 · 8f61cc1
1 parent 05f1a06
commit 8f61cc1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/test/unit_tests/test_interface.py b/test/unit_tests/test_interface.py
@@ -3,7 +3,6 @@
 from unittest.mock import Mock
 
 from com_redhat_kdump import common
-from .mock import MockBuiltinRead
 from com_redhat_kdump.constants import KDUMP
 from com_redhat_kdump.service.kdump import KdumpService
 from com_redhat_kdump.service.kdump_interface import KdumpInterface
@@ -50,15 +49,13 @@ def test_fadump_enabled(self):
         self._check_properties_changed("FadumpEnabled", True)
         self.assertEqual(self._interface.FadumpEnabled, True)
 
-    @patch("com_redhat_kdump.service.kdump.KdumpService.check_reserved_memory", return_value="256")
-    def test_reserved_memory(self, _mock_read):
+    def test_reserved_memory(self):
         self._interface.ReservedMemory = "256"
         self._check_properties_changed("ReservedMemory", "256")
         self.assertEqual(self._interface.ReservedMemory, "256")
 
-    @patch("com_redhat_kdump.common.getMemoryBounds", return_value=(500, 800, 1))
-    def test_check_reserved_memory(self, _mock_read):
-        self._service._lower , self._service._upper, self._service._step = common.getMemoryBounds()
-        self.assertEqual(self._service.check_reserved_memory("900"), "800")
-        self.assertEqual(self._service.check_reserved_memory("400"), "500")
-        self.assertEqual(self._service.check_reserved_memory("600"), "600")
+    @patch("com_redhat_kdump.service.kdump.getMemoryBounds", return_value = (500, 800, 1))
+    def test_check_reserved_memory(self, mocker):
+        service1 = KdumpService()
+        for memory, reserved in [("900", "800"), ("400", "500"), ("600", "600")]:
+            self.assertEqual(service1.check_reserved_memory(memory), reserved)
diff --git a/test/unit_tests/test_kickstart.py b/test/unit_tests/test_kickstart.py
@@ -2,13 +2,13 @@
 from unittest.case import TestCase
 from unittest.mock import patch
 from com_redhat_kdump import common
-from .mock import MockBuiltinRead
 from com_redhat_kdump.service.kdump import KdumpService
 
 
 class KdumpKickstartTestCase(TestCase):
 
-    def setUp(self):
+    @patch("com_redhat_kdump.service.kdump.getMemoryBounds", return_value=(160, 800, 1))
+    def setUp(self, mocker):
         # Show unlimited diff.
         self.maxDiff = None
 
@@ -70,10 +70,7 @@ def test_ks_disable(self):
         %end
         """)
 
-    @patch("com_redhat_kdump.common.getMemoryBounds", return_value=(160, 800, 1))
-    def test_ks_reserve_mb(self, _mock_read):
-        self._service._lower , self._service._upper, self._service._step = common.getMemoryBounds()
-        self.assertEqual((self._service._lower , self._service._upper), (160, 800))
+    def test_ks_reserve_mb(self):
         self._check_ks_input("""
         %addon com_redhat_kdump --enable --reserve-mb=256
         %end