summaryrefslogtreecommitdiffstats
path: root/utils/test
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-20 09:19:16 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-20 09:19:16 -0500
commit9e9bd4407028549b9e2a3b3343f1e7b785a78b23 (patch)
treeb49a5d07fe3d30b57e8ed547b8baf4ff86134779 /utils/test
parent79763da797333960ebf90119c9561b890fbd0a1a (diff)
parentc6b7ba8b0017af0875bd912ad0e83fb3d5879591 (diff)
downloadopenshift-9e9bd4407028549b9e2a3b3343f1e7b785a78b23.tar.gz
openshift-9e9bd4407028549b9e2a3b3343f1e7b785a78b23.tar.bz2
openshift-9e9bd4407028549b9e2a3b3343f1e7b785a78b23.tar.xz
openshift-9e9bd4407028549b9e2a3b3343f1e7b785a78b23.zip
Merge pull request #902 from dgoodwin/rpm-test-fix
Default to OSE 3.1 in interactive installer instead of 3.0.
Diffstat (limited to 'utils/test')
-rw-r--r--utils/test/cli_installer_tests.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/utils/test/cli_installer_tests.py b/utils/test/cli_installer_tests.py
index fc16d9ceb..baadad358 100644
--- a/utils/test/cli_installer_tests.py
+++ b/utils/test/cli_installer_tests.py
@@ -284,7 +284,9 @@ class UnattendedCliTests(OOCliFixture):
'.ansible/callback_facts.yaml'),
env_vars['OO_INSTALL_CALLBACK_FACTS_YAML'])
self.assertEqual('/tmp/ansible.log', env_vars['ANSIBLE_LOG_PATH'])
- self.assertTrue('ANSIBLE_CONFIG' not in env_vars)
+ # If user running test has rpm installed, this might be set to default:
+ self.assertTrue('ANSIBLE_CONFIG' not in env_vars or
+ env_vars['ANSIBLE_CONFIG'] == cli.DEFAULT_ANSIBLE_CONFIG)
# Make sure we ran on the expected masters and nodes:
hosts = run_playbook_mock.call_args[0][0]
@@ -450,14 +452,18 @@ class UnattendedCliTests(OOCliFixture):
if expected_result:
self.assertEquals(expected_result, facts_env_vars['ANSIBLE_CONFIG'])
else:
- self.assertFalse('ANSIBLE_CONFIG' in facts_env_vars)
+ # If user running test has rpm installed, this might be set to default:
+ self.assertTrue('ANSIBLE_CONFIG' not in facts_env_vars or
+ facts_env_vars['ANSIBLE_CONFIG'] == cli.DEFAULT_ANSIBLE_CONFIG)
# Test the env vars for main playbook:
env_vars = run_ansible_mock.call_args[0][2]
if expected_result:
self.assertEquals(expected_result, env_vars['ANSIBLE_CONFIG'])
else:
- self.assertFalse('ANSIBLE_CONFIG' in env_vars)
+ # If user running test has rpm installed, this might be set to default:
+ self.assertTrue('ANSIBLE_CONFIG' not in env_vars or
+ env_vars['ANSIBLE_CONFIG'] == cli.DEFAULT_ANSIBLE_CONFIG)
class AttendedCliTests(OOCliFixture):