summaryrefslogtreecommitdiff
path: root/ironic_python_agent/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ironic_python_agent/tests')
-rw-r--r--ironic_python_agent/tests/unit/extensions/test_image.py25
1 files changed, 22 insertions, 3 deletions
diff --git a/ironic_python_agent/tests/unit/extensions/test_image.py b/ironic_python_agent/tests/unit/extensions/test_image.py
index 347e2450..74942fa4 100644
--- a/ironic_python_agent/tests/unit/extensions/test_image.py
+++ b/ironic_python_agent/tests/unit/extensions/test_image.py
@@ -325,7 +325,8 @@ class TestImageExtension(base.IronicAgentTest):
expected = [mock.call('partx', '-u', self.fake_dev, attempts=3,
delay_on_retry=True),
mock.call('udevadm', 'settle'),
- mock.call('lsblk', '-PbioKNAME,UUID,TYPE', self.fake_dev)]
+ mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE',
+ self.fake_dev)]
mock_execute.assert_has_calls(expected)
self.assertFalse(mock_dispatch.called)
@@ -342,7 +343,8 @@ class TestImageExtension(base.IronicAgentTest):
expected = [mock.call('partx', '-u', self.fake_dev, attempts=3,
delay_on_retry=True),
mock.call('udevadm', 'settle'),
- mock.call('lsblk', '-PbioKNAME,UUID,TYPE', self.fake_dev)]
+ mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE',
+ self.fake_dev)]
mock_execute.assert_has_calls(expected)
self.assertFalse(mock_dispatch.called)
@@ -357,6 +359,23 @@ class TestImageExtension(base.IronicAgentTest):
expected = [mock.call('partx', '-u', self.fake_dev, attempts=3,
delay_on_retry=True),
mock.call('udevadm', 'settle'),
- mock.call('lsblk', '-PbioKNAME,UUID,TYPE', self.fake_dev)]
+ mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE',
+ self.fake_dev)]
+ mock_execute.assert_has_calls(expected)
+ self.assertFalse(mock_dispatch.called)
+
+ def test__get_partition_partuuid(self, mock_execute, mock_dispatch):
+ lsblk_output = ('''KNAME="test" UUID="" TYPE="disk"
+ KNAME="test1" UUID="256a39e3-ca3c-4fb8-9cc2-b32eec441f47" TYPE="part"
+ KNAME="test2" PARTUUID="%s" TYPE="part"''' % self.fake_root_uuid)
+ mock_execute.side_effect = (None, None, [lsblk_output])
+
+ root_part = image._get_partition(self.fake_dev, self.fake_root_uuid)
+ self.assertEqual('/dev/test2', root_part)
+ expected = [mock.call('partx', '-u', self.fake_dev, attempts=3,
+ delay_on_retry=True),
+ mock.call('udevadm', 'settle'),
+ mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE',
+ self.fake_dev)]
mock_execute.assert_has_calls(expected)
self.assertFalse(mock_dispatch.called)