From 9f66a95aa7e9594800a7a9caedc27c8f67318238 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Fri, 22 Jul 2022 07:01:28 -0700 Subject: [PATCH] Fix adoption unit test image check We added an additional check, and it turns out the test was passing when no local webserver was present because it was getting checked, but things would break when an actual webserver existed which returned a redirect Change-Id: If8d29ba3676cf8e11a1010890c90bb67b0d60cb3 Story: 2010181 Task: 45862 --- ironic/tests/unit/conductor/test_manager.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ironic/tests/unit/conductor/test_manager.py b/ironic/tests/unit/conductor/test_manager.py index ddd9cbae47..b433aa4a58 100644 --- a/ironic/tests/unit/conductor/test_manager.py +++ b/ironic/tests/unit/conductor/test_manager.py @@ -7321,6 +7321,8 @@ class DoNodeAdoptionTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase): mock_boot_validate.assert_not_called() self.assertNotIn('is_whole_disk_image', task.node.driver_internal_info) + @mock.patch('ironic.common.image_service.HttpImageService.validate_href', + autospec=True) @mock.patch('ironic.drivers.modules.fake.FakePower.validate', autospec=True) @mock.patch('ironic.drivers.modules.fake.FakeBoot.validate', autospec=True) @@ -7335,7 +7337,8 @@ class DoNodeAdoptionTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase): mock_take_over, mock_start_console, mock_boot_validate, - mock_power_validate): + mock_power_validate, + mock_validate_href): """Test a successful node adoption""" self._start_service() node = obj_utils.create_test_node( @@ -7359,6 +7362,8 @@ class DoNodeAdoptionTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase): mock_boot_validate.assert_called_once_with(task.driver.boot, task) self.assertTrue(task.node.driver_internal_info.get( 'is_whole_disk_image')) + mock_validate_href.assert_called_once_with(mock.ANY, + 'http://127.0.0.1/image') @mock.patch('ironic.drivers.modules.fake.FakeBoot.validate', autospec=True) @mock.patch('ironic.drivers.modules.fake.FakeConsole.start_console',