diff options
Diffstat (limited to 'tests/unittests/config/test_cc_resizefs.py')
| -rw-r--r-- | tests/unittests/config/test_cc_resizefs.py | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/tests/unittests/config/test_cc_resizefs.py b/tests/unittests/config/test_cc_resizefs.py index d7fda1b8..90814e61 100644 --- a/tests/unittests/config/test_cc_resizefs.py +++ b/tests/unittests/config/test_cc_resizefs.py @@ -83,37 +83,42 @@ class TestResizefs(CiTestCase): def test_handle_noops_on_disabled(self): """The handle function logs when the configuration disables resize.""" cfg = {"resize_rootfs": False} - handle("cc_resizefs", cfg, cloud=None, log=LOG, args=[]) + handle("cc_resizefs", cfg, cloud=None, args=[]) self.assertIn( "DEBUG: Skipping module named cc_resizefs, resizing disabled\n", self.logs.getvalue(), ) @mock.patch("cloudinit.config.cc_resizefs.util.get_mount_info") - def test_handle_warns_on_unknown_mount_info(self, m_get_mount_info): + @mock.patch("cloudinit.config.cc_resizefs.LOG") + def test_handle_warns_on_unknown_mount_info(self, m_log, m_get_mount_info): """handle warns when get_mount_info sees unknown filesystem for /.""" m_get_mount_info.return_value = None cfg = {"resize_rootfs": True} - handle("cc_resizefs", cfg, cloud=None, log=LOG, args=[]) + handle("cc_resizefs", cfg, cloud=None, args=[]) logs = self.logs.getvalue() self.assertNotIn( "WARNING: Invalid cloud-config provided:\nresize_rootfs:", logs ) - self.assertIn( - "WARNING: Could not determine filesystem type of /\n", logs + self.assertEqual( + ("Could not determine filesystem type of %s", "/"), + m_log.warning.call_args[0], ) self.assertEqual( - [mock.call("/", LOG)], m_get_mount_info.call_args_list + [mock.call("/", m_log)], m_get_mount_info.call_args_list ) - def test_handle_warns_on_undiscoverable_root_path_in_commandline(self): + @mock.patch("cloudinit.config.cc_resizefs.LOG") + def test_handle_warns_on_undiscoverable_root_path_in_commandline( + self, m_log + ): """handle noops when the root path is not found on the commandline.""" cfg = {"resize_rootfs": True} exists_mock_path = "cloudinit.config.cc_resizefs.os.path.exists" def fake_mount_info(path, log): self.assertEqual("/", path) - self.assertEqual(LOG, log) + self.assertEqual(m_log, log) return ("/dev/root", "ext4", "/") with mock.patch(exists_mock_path) as m_exists: @@ -129,11 +134,11 @@ class TestResizefs(CiTestCase): "cc_resizefs", cfg, cloud=None, - log=LOG, args=[], ) - logs = self.logs.getvalue() - self.assertIn("WARNING: Unable to find device '/dev/root'", logs) + self.assertIn( + "Unable to find device '/dev/root'", m_log.warning.call_args[0] + ) def test_resize_zfs_cmd_return(self): zpool = "zroot" @@ -183,8 +188,8 @@ class TestResizefs(CiTestCase): cfg = {"resize_rootfs": True} with mock.patch("cloudinit.config.cc_resizefs.do_resize") as dresize: - handle("cc_resizefs", cfg, cloud=None, log=LOG, args=[]) - ret = dresize.call_args[0][0] + handle("cc_resizefs", cfg, cloud=None, args=[]) + ret = dresize.call_args[0] self.assertEqual(("zpool", "online", "-e", "vmzroot", disk), ret) @@ -217,11 +222,10 @@ class TestResizefs(CiTestCase): with mock.patch("cloudinit.config.cc_resizefs.do_resize") as dresize: with mock.patch("cloudinit.config.cc_resizefs.os.stat") as m_stat: m_stat.side_effect = fake_stat - handle("cc_resizefs", cfg, cloud=None, log=LOG, args=[]) - + handle("cc_resizefs", cfg, cloud=None, args=[]) self.assertEqual( ("zpool", "online", "-e", "zroot", "/dev/" + disk), - dresize.call_args[0][0], + dresize.call_args[0], ) @@ -276,7 +280,6 @@ class TestMaybeGetDevicePathAsWritableBlock(CiTestCase): maybe_get_writable_device_path, "overlayroot", info, - LOG, ) self.assertIsNone(devpath) self.assertIn( @@ -306,7 +309,6 @@ class TestMaybeGetDevicePathAsWritableBlock(CiTestCase): maybe_get_writable_device_path, "/dev/root", info, - LOG, ) self.assertIsNone(devpath) logs = self.logs.getvalue() @@ -321,7 +323,6 @@ class TestMaybeGetDevicePathAsWritableBlock(CiTestCase): maybe_get_writable_device_path, "/dev/I/dont/exist", info, - LOG, ) self.assertIsNone(devpath) self.assertIn( @@ -339,7 +340,6 @@ class TestMaybeGetDevicePathAsWritableBlock(CiTestCase): maybe_get_writable_device_path, "/dev/I/dont/exist", info, - LOG, ) self.assertIsNone(devpath) self.assertIn( @@ -363,7 +363,6 @@ class TestMaybeGetDevicePathAsWritableBlock(CiTestCase): maybe_get_writable_device_path, "/dev/I/dont/exist", info, - LOG, ) self.assertEqual( "Something unexpected", str(context_manager.exception) @@ -381,7 +380,6 @@ class TestMaybeGetDevicePathAsWritableBlock(CiTestCase): maybe_get_writable_device_path, fake_devpath, info, - LOG, ) self.assertIsNone(devpath) self.assertIn( @@ -403,7 +401,6 @@ class TestMaybeGetDevicePathAsWritableBlock(CiTestCase): maybe_get_writable_device_path, fake_devpath, info, - LOG, ) self.assertIsNone(devpath) self.assertIn( @@ -433,7 +430,6 @@ class TestMaybeGetDevicePathAsWritableBlock(CiTestCase): maybe_get_writable_device_path, "/dev/root", info, - LOG, ) self.assertEqual("/dev/disk/by-uuid/my-uuid", devpath) self.assertIn( @@ -490,7 +486,7 @@ class TestMaybeGetDevicePathAsWritableBlock(CiTestCase): ): freebsd.return_value = True info = "dev=gpt/system mnt_point=/ path=/" - devpth = maybe_get_writable_device_path("gpt/system", info, LOG) + devpth = maybe_get_writable_device_path("gpt/system", info) self.assertEqual("gpt/system", devpth) |