diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-26 12:22:34 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-26 12:22:34 -0400 |
| commit | 5d2167cd565e97157f81996c872540bb6515d205 (patch) | |
| tree | 49eb596ef433beb7d32cee99b3b15151e0b93928 /utils/test | |
| parent | 8a0153e992938a9b3441faca77305be1bb42f4d2 (diff) | |
| download | openshift-5d2167cd565e97157f81996c872540bb6515d205.tar.gz openshift-5d2167cd565e97157f81996c872540bb6515d205.tar.bz2 openshift-5d2167cd565e97157f81996c872540bb6515d205.tar.xz openshift-5d2167cd565e97157f81996c872540bb6515d205.zip | |
Trim assertions in HA testing.
We're asserting the same things in loading facts over and over, which is not
what these tests are really intended to catch. This behavior is tested
elsewhere.
Diffstat (limited to 'utils/test')
| -rw-r--r-- | utils/test/cli_installer_tests.py | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/utils/test/cli_installer_tests.py b/utils/test/cli_installer_tests.py index b1ab7b283..d6cee3cc2 100644 --- a/utils/test/cli_installer_tests.py +++ b/utils/test/cli_installer_tests.py @@ -640,20 +640,6 @@ class UnattendedCliTests(OOCliFixture): result = self.runner.invoke(cli.cli, self.cli_args) self.assert_result(result, 0) - load_facts_args = load_facts_mock.call_args[0] - self.assertEquals(os.path.join(self.work_dir, ".ansible/hosts"), - load_facts_args[0]) - self.assertEquals(os.path.join(self.work_dir, - "playbooks/byo/openshift_facts.yml"), load_facts_args[1]) - env_vars = load_facts_args[2] - self.assertEquals(os.path.join(self.work_dir, - '.ansible/callback_facts.yaml'), - env_vars['OO_INSTALL_CALLBACK_FACTS_YAML']) - self.assertEqual('/tmp/ansible.log', env_vars['ANSIBLE_LOG_PATH']) - # 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] hosts_to_run_on = run_playbook_mock.call_args[0][1] @@ -678,20 +664,6 @@ class UnattendedCliTests(OOCliFixture): self.assert_result(result, 0) self.assertTrue('No master load balancer specified in config' in result.output) - load_facts_args = load_facts_mock.call_args[0] - self.assertEquals(os.path.join(self.work_dir, ".ansible/hosts"), - load_facts_args[0]) - self.assertEquals(os.path.join(self.work_dir, - "playbooks/byo/openshift_facts.yml"), load_facts_args[1]) - env_vars = load_facts_args[2] - self.assertEquals(os.path.join(self.work_dir, - '.ansible/callback_facts.yaml'), - env_vars['OO_INSTALL_CALLBACK_FACTS_YAML']) - self.assertEqual('/tmp/ansible.log', env_vars['ANSIBLE_LOG_PATH']) - # 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] hosts_to_run_on = run_playbook_mock.call_args[0][1] |