diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-08-09 13:31:02 -0400 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-08-09 13:31:02 -0400 |
| commit | be5414d9b480423dea55defd6e57bf4b833ee54d (patch) | |
| tree | c57201709f774fc46b4488ad39493834abecbe14 | |
| parent | 47fbb92cf3727299c06c6c139c813c065494478d (diff) | |
| download | openshift-be5414d9b480423dea55defd6e57bf4b833ee54d.tar.gz openshift-be5414d9b480423dea55defd6e57bf4b833ee54d.tar.bz2 openshift-be5414d9b480423dea55defd6e57bf4b833ee54d.tar.xz openshift-be5414d9b480423dea55defd6e57bf4b833ee54d.zip | |
a-o-i: Update nosetests for ansible_ssh_user
Update the nosetests to reflect the new location of ansible_ssh_user
in the config file.
| -rw-r--r-- | utils/test/cli_installer_tests.py | 12 | ||||
| -rw-r--r-- | utils/test/fixture.py | 2 | ||||
| -rw-r--r-- | utils/test/oo_config_tests.py | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/utils/test/cli_installer_tests.py b/utils/test/cli_installer_tests.py index 3044a2449..98e111043 100644 --- a/utils/test/cli_installer_tests.py +++ b/utils/test/cli_installer_tests.py @@ -101,8 +101,8 @@ MOCK_FACTS_QUICKHA = { # Missing connect_to on some hosts: BAD_CONFIG = """ variant: %s -ansible_ssh_user: root deployment: + ansible_ssh_user: root hosts: - connect_to: 10.0.0.1 ip: 10.0.0.1 @@ -132,8 +132,8 @@ deployment: QUICKHA_CONFIG = """ variant: %s -ansible_ssh_user: root deployment: + ansible_ssh_user: root hosts: - connect_to: 10.0.0.1 ip: 10.0.0.1 @@ -189,8 +189,8 @@ deployment: QUICKHA_2_MASTER_CONFIG = """ variant: %s -ansible_ssh_user: root deployment: + ansible_ssh_user: root hosts: - connect_to: 10.0.0.1 ip: 10.0.0.1 @@ -238,8 +238,8 @@ deployment: QUICKHA_CONFIG_REUSED_LB = """ variant: %s -ansible_ssh_user: root deployment: + ansible_ssh_user: root hosts: - connect_to: 10.0.0.1 ip: 10.0.0.1 @@ -281,8 +281,8 @@ deployment: QUICKHA_CONFIG_NO_LB = """ variant: %s -ansible_ssh_user: root deployment: + ansible_ssh_user: root hosts: - connect_to: 10.0.0.1 ip: 10.0.0.1 @@ -323,8 +323,8 @@ deployment: QUICKHA_CONFIG_PRECONFIGURED_LB = """ variant: %s -ansible_ssh_user: root deployment: + ansible_ssh_user: root hosts: - connect_to: 10.0.0.1 ip: 10.0.0.1 diff --git a/utils/test/fixture.py b/utils/test/fixture.py index 006df739b..152c06da8 100644 --- a/utils/test/fixture.py +++ b/utils/test/fixture.py @@ -11,9 +11,9 @@ from click.testing import CliRunner SAMPLE_CONFIG = """ variant: %s variant_version: 3.2 -ansible_ssh_user: root master_routingconfig_subdomain: example.com deployment: + ansible_ssh_user: root hosts: - connect_to: 10.0.0.1 ip: 10.0.0.1 diff --git a/utils/test/oo_config_tests.py b/utils/test/oo_config_tests.py index c19fe9e0d..10439c9ae 100644 --- a/utils/test/oo_config_tests.py +++ b/utils/test/oo_config_tests.py @@ -13,8 +13,8 @@ from ooinstall.oo_config import OOConfig, Host, OOConfigInvalidHostError SAMPLE_CONFIG = """ variant: openshift-enterprise variant_version: 3.2 -ansible_ssh_user: root deployment: + ansible_ssh_user: root hosts: - connect_to: master-private.example.com ip: 10.0.0.1 @@ -65,6 +65,7 @@ validated_facts: CONFIG_INCOMPLETE_FACTS = """ deployment: + ansible_ssh_user: root hosts: - connect_to: 10.0.0.1 ip: 10.0.0.1 @@ -90,8 +91,8 @@ deployment: CONFIG_BAD = """ variant: openshift-enterprise -ansible_ssh_user: root deployment: + ansible_ssh_user: root hosts: - connect_to: master-private.example.com ip: 10.0.0.1 @@ -212,7 +213,7 @@ class OOConfigTests(OOInstallFixture): self.assertTrue('hostname' in h) self.assertTrue('public_hostname' in h) - self.assertTrue('ansible_ssh_user' in written_config) + self.assertTrue('ansible_ssh_user' in written_config['deployment']) self.assertTrue('variant' in written_config) self.assertEquals('v2', written_config['version']) |