summaryrefslogtreecommitdiffstats
path: root/utils/test/fixture.py
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-05 16:38:03 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-05 16:38:03 -0400
commitf13efb21bb48a2202a09d70bf0a0103461b22950 (patch)
tree8286e8f422376c60cef480cc612bed24f031dac9 /utils/test/fixture.py
parentdebe6109ad57c0d722c41a720dba95a1eb1f3d35 (diff)
parent67d4685ef8885ff3ee759f5a36d9c97ba2012c50 (diff)
downloadopenshift-f13efb21bb48a2202a09d70bf0a0103461b22950.tar.gz
openshift-f13efb21bb48a2202a09d70bf0a0103461b22950.tar.bz2
openshift-f13efb21bb48a2202a09d70bf0a0103461b22950.tar.xz
openshift-f13efb21bb48a2202a09d70bf0a0103461b22950.zip
Merge pull request #1654 from dgoodwin/gen-inventory
Add --gen-inventory command to atomic-openshift-installer.
Diffstat (limited to 'utils/test/fixture.py')
-rw-r--r--utils/test/fixture.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/test/fixture.py b/utils/test/fixture.py
index d6222dfaa..1657d8f46 100644
--- a/utils/test/fixture.py
+++ b/utils/test/fixture.py
@@ -68,7 +68,7 @@ class OOCliFixture(OOInstallFixture):
def _verify_load_facts(self, load_facts_mock):
""" Check that we ran load facts with expected inputs. """
load_facts_args = load_facts_mock.call_args[0]
- self.assertEquals(os.path.join(self.work_dir, ".ansible/hosts"),
+ self.assertEquals(os.path.join(self.work_dir, "hosts"),
load_facts_args[0])
self.assertEquals(os.path.join(self.work_dir,
"playbooks/byo/openshift_facts.yml"),
@@ -81,8 +81,8 @@ class OOCliFixture(OOInstallFixture):
def _verify_run_playbook(self, run_playbook_mock, exp_hosts_len, exp_hosts_to_run_on_len):
""" Check that we ran playbook with expected inputs. """
- hosts = run_playbook_mock.call_args[0][0]
- hosts_to_run_on = run_playbook_mock.call_args[0][1]
+ hosts = run_playbook_mock.call_args[0][1]
+ hosts_to_run_on = run_playbook_mock.call_args[0][2]
self.assertEquals(exp_hosts_len, len(hosts))
self.assertEquals(exp_hosts_to_run_on_len, len(hosts_to_run_on))
@@ -133,8 +133,8 @@ class OOCliFixture(OOInstallFixture):
self._verify_run_playbook(run_playbook_mock, exp_hosts_len, exp_hosts_to_run_on_len)
# 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]
+ hosts = run_playbook_mock.call_args[0][1]
+ hosts_to_run_on = run_playbook_mock.call_args[0][2]
self.assertEquals(exp_hosts_len, len(hosts))
self.assertEquals(exp_hosts_to_run_on_len, len(hosts_to_run_on))