Fixes undercloud install failure with setting hostname

[apex.git] / apex / tests / test_apex_common_utils.py

diff --git a/apex/tests/test_apex_common_utils.py b/apex/tests/test_apex_common_utils.py
index 0e4041c..1ecb7df 100644 (file)
--- a/apex/tests/test_apex_common_utils.py
+++ b/apex/tests/test_apex_common_utils.py
@@ -64,8 +64,11 @@ class TestCommonUtils:
 
     def test_run_ansible(self):
         playbook = 'apex/tests/playbooks/test_playbook.yaml'
+        extra_vars = [{'testvar1': 'value1', 'testvar2': 'value2'}]
         assert_equal(utils.run_ansible(None, os.path.join(playbook),
                                        dry_run=True), None)
+        assert_equal(utils.run_ansible(extra_vars, os.path.join(playbook),
+                                       dry_run=True, host='1.1.1.1'), None)
 
     def test_failed_run_ansible(self):
         playbook = 'apex/tests/playbooks/test_failed_playbook.yaml'
@@ -81,7 +84,7 @@ class TestCommonUtils:
 
     def test_fetch_upstream_previous_file(self):
         test_file = 'overcloud-full.tar.md5'
-        url = 'https://images.rdoproject.org/master/delorean/' \
+        url = 'https://images.rdoproject.org/master/rdo_trunk/' \
               'current-tripleo/stable/'
         os.makedirs('/tmp/fetch_test', exist_ok=True)
         open("/tmp/fetch_test/{}".format(test_file), 'w').close()
@@ -132,7 +135,7 @@ class TestCommonUtils:
         assert output is not None
 
     def test_open_invalid_webpage(self):
-        assert_raises(urllib.request.URLError, utils.open_webpage,
+        assert_raises(exceptions.FetchException, utils.open_webpage,
                       'http://inv4lIdweb-page.com')
 
     @patch('builtins.open', a_mock_open)
@@ -148,3 +151,12 @@ class TestCommonUtils:
         new_data = {'parameter_defaults': settings}
         mock_yaml_dump.assert_called_once_with(new_data, a_mock_open(),
                                                default_flow_style=False)
+
+    def test_unique(self):
+        dummy_list = [1, 2, 1, 3, 4, 5, 5]
+        assert_equal(utils.unique(dummy_list), [1, 2, 3, 4, 5])
+
+    def test_find_container_client(self):
+        for version in 'rocky', 'queens':
+            assert_equal(utils.find_container_client(version), 'docker')
+        assert_equal(utils.find_container_client('master'), 'podman')