Merge ~mwhudson/curtin:too-much-mocking into curtin:master

[Michael Hudson-Doyle]

test_commands_block_meta: do not assert test creates 0 sized partition

TestMultipathPartitionHandler.setUp() mocks out the entire util module,
which had some unintended consequences that were baked into the test
expectations. Scope the mocking better and fix the test's expectations.

[Dan Bungert (dbungert)]

One suggested tweak

review: Approve

fdad2d2... by Michael Hudson-Doyle on 2023-08-01

remove leftover debugging

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:60dd2ea2190052433609d115ccd3414a90a42b8f
https://jenkins.canonical.com/server-team/job/curtin-ci/162/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/162/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/162/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/162/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/162/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/162//rebuild

review: Approve (continuous-integration)

diff --git a/tests/unittests/test_commands_block_meta.py b/tests/unittests/test_commands_block_meta.py
index f1bc18c..028d04e 100644
--- a/tests/unittests/test_commands_block_meta.py
+++ b/tests/unittests/test_commands_block_meta.py
@@ -2759,7 +2759,8 @@ class TestMultipathPartitionHandler(CiTestCase):
 
         basepath = 'curtin.commands.block_meta.'
         self.add_patch(basepath + 'get_path_to_storage_volume', 'm_getpath')
-        self.add_patch(basepath + 'util', 'm_util')
+        self.add_patch(basepath + 'util.subp', 'm_subp')
+        self.add_patch(basepath + 'util.del_file', 'm_del_file')
         self.add_patch(basepath + 'make_dname', 'm_dname')
         self.add_patch(basepath + 'block', 'm_block')
         self.add_patch(basepath + 'multipath', 'm_mp')
@@ -2813,11 +2814,11 @@ class TestMultipathPartitionHandler(CiTestCase):
         block_meta.partition_handler(part2, self.storage_config, empty_context)
 
         expected_calls = [
-            call(['sgdisk', '--new', '2:4096:4096', '--typecode=2:8300',
+            call(['sgdisk', '--new', '2:4096:10489855', '--typecode=2:8300',
                   disk_path], capture=True),
             call(['kpartx', '-v', '-a', '-s', '-p', '-part', disk_path]),
         ]
-        self.assertEqual(expected_calls, self.m_util.subp.call_args_list)
+        self.assertEqual(expected_calls, self.m_subp.call_args_list)
 
     @patch('curtin.commands.block_meta.os.path')
     @patch('curtin.commands.block_meta.calc_partition_info')
@@ -2842,13 +2843,13 @@ class TestMultipathPartitionHandler(CiTestCase):
         block_meta.partition_handler(part2, self.storage_config, empty_context)
 
         expected_calls = [
-            call(['sgdisk', '--new', '2:4096:4096', '--typecode=2:8300',
+            call(['sgdisk', '--new', '2:4096:10489855', '--typecode=2:8300',
                   disk_path], capture=True),
             call(['kpartx', '-v', '-a', '-s', '-p', '-part', disk_path]),
         ]
-        self.assertEqual(expected_calls, self.m_util.subp.call_args_list)
+        self.assertEqual(expected_calls, self.m_subp.call_args_list)
         self.assertEqual([call(disk_path + '-part2')],
-                         self.m_util.del_file.call_args_list)
+                         self.m_del_file.call_args_list)
 
 
 class TestCalcPartitionInfo(CiTestCase):