diff options
| author | Seunghun Lee <seunghun@stackhpc.com> | 2025-07-29 14:46:17 +0100 |
|---|---|---|
| committer | Seunghun Lee <seunghun@stackhpc.com> | 2025-07-30 11:34:56 +0100 |
| commit | 00f8cb4c58055e6465b5209a035f390b0f34568b (patch) | |
| tree | 8a827d2915c78e13b428a52e106b76a3f392b25e /tests | |
| parent | 338640ad245acf92f139809facc501ae4dc009d6 (diff) | |
| download | kolla-ansible-00f8cb4c58055e6465b5209a035f390b0f34568b.tar.gz kolla-ansible-00f8cb4c58055e6465b5209a035f390b0f34568b.zip | |
Fix RabbitMQ version check always getting skipped
Refactoring kolla_container_facts.py [1] caused breaking change because
of result output structure was changed.
Therefore the condition for the version check block always become false
(``container_facts[service.container_name]`` is always undefined).
Fixing this issue by matching the new kolla_container_facts result
structure.
Additionally, added assertions in tests for ``kolla_container_facts`` to
ensure the container fact result is not in old structure.
[1] https://review.opendev.org/c/openstack/kolla-ansible/+/911505
Closes-Bug: #2102662
Change-Id: I91a5f9c4b0e3c40ef21c25fb4866b07e25fbc017
Signed-off-by: Seunghun Lee <seunghun@stackhpc.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_kolla_container_facts.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/test_kolla_container_facts.py b/tests/test_kolla_container_facts.py index 0db0c2eb4..e58b058c5 100644 --- a/tests/test_kolla_container_facts.py +++ b/tests/test_kolla_container_facts.py @@ -148,6 +148,7 @@ class TestContainerFacts(base.BaseTestCase): self.assertFalse(self.dfw.result['changed']) self.assertEqual(self.dfw.client.containers.list.call_count, 1) self.assertIn('my_container', self.dfw.result['containers']) + self.assertNotIn('my_container', self.dfw.result) self.assertDictEqual( self.fake_data['containers'][0], self.dfw.result['containers']['my_container']) @@ -162,6 +163,7 @@ class TestContainerFacts(base.BaseTestCase): self.assertFalse(self.dfw.result['changed']) self.assertIn('my_container', self.dfw.result['containers']) + self.assertNotIn('my_container', self.dfw.result) self.assertNotIn('exited_container', self.dfw.result['containers']) def test_get_container_all(self): @@ -173,6 +175,7 @@ class TestContainerFacts(base.BaseTestCase): self.assertFalse(self.dfw.result['changed']) self.assertIn('my_container', self.dfw.result['containers']) + self.assertNotIn('my_container', self.dfw.result) self.assertNotIn('exited_container', self.dfw.result['containers']) def test_get_containers_env(self): @@ -190,6 +193,7 @@ class TestContainerFacts(base.BaseTestCase): self.assertFalse(self.dfw.result['changed']) self.dfw.client.containers.get.assert_called_once_with('my_container') self.assertIn('my_container', self.dfw.result['envs']) + self.assertNotIn('my_container', self.dfw.result) self.assertEquals(self.dfw.result['envs']['my_container'], fake_env) def test_get_containers_env_negative(self): @@ -222,6 +226,7 @@ class TestContainerFacts(base.BaseTestCase): self.assertFalse(self.dfw.result['changed']) self.dfw.client.containers.get.assert_called_once_with('my_container') self.assertIn('my_container', self.dfw.result['states']) + self.assertNotIn('my_container', self.dfw.result) def test_get_containers_state_negative(self): self.dfw = get_DockerFactsWorker({'name': ['fake_container'], @@ -248,6 +253,7 @@ class TestContainerFacts(base.BaseTestCase): self.assertFalse(self.dfw.result['changed']) self.dfw.client.volumes.list.assert_called_once_with() self.assertIn('my_volume', self.dfw.result['volumes']) + self.assertNotIn('my_volume', self.dfw.result) self.assertNotIn('another_volume', self.dfw.result['volumes']) self.assertEqual(len(self.dfw.result['volumes']), 1) self.assertDictEqual( @@ -268,6 +274,8 @@ class TestContainerFacts(base.BaseTestCase): self.dfw.client.volumes.list.assert_called_once_with() self.assertIn('my_volume', self.dfw.result['volumes']) self.assertIn('another_volume', self.dfw.result['volumes']) + self.assertNotIn('my_volume', self.dfw.result) + self.assertNotIn('another_volume', self.dfw.result) self.assertEqual(len(self.dfw.result['volumes']), 2) self.assertDictEqual( self.dfw.result['volumes']['my_volume'], @@ -289,6 +297,8 @@ class TestContainerFacts(base.BaseTestCase): self.dfw.client.volumes.list.assert_called_once_with() self.assertIn('my_volume', self.dfw.result['volumes']) self.assertIn('another_volume', self.dfw.result['volumes']) + self.assertNotIn('my_volume', self.dfw.result) + self.assertNotIn('another_volume', self.dfw.result) self.assertDictEqual( self.dfw.result['volumes']['my_volume'], self.fake_data['volumes'][0]) |