openstack/kayobe
Code Issues Proposed changes

Fix kolla-ansible unit test failures

Browse Source 
Seems like default path was changed and broke the tests:
19ceec45cd
This commit is contained in:
John Garbutt
2017-08-17 17:22:27 +01:00
parent 39a37a1647
commit a3d1b07652
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kayobe/tests/unit/test_kolla_ansible.py
View File

@@ -35,7 +35,7 @@ class TestCase(unittest.TestCase):
parsed_args = parser.parse_args([]) parsed_args = parser.parse_args([])
kolla_ansible.run(parsed_args, "command", "overcloud") kolla_ansible.run(parsed_args, "command", "overcloud")
expected_cmd = [ expected_cmd = [
"source", "ansible/kolla-venv/bin/activate", "&&", "source", "/opt/kayobe/venvs/kolla/bin/activate", "&&",
"kolla-ansible", "command", "kolla-ansible", "command",
"--inventory", "/etc/kolla/inventory/overcloud", "--inventory", "/etc/kolla/inventory/overcloud",
] ]
@@ -57,7 +57,7 @@ class TestCase(unittest.TestCase):
parsed_args = parser.parse_args(args) parsed_args = parser.parse_args(args)
kolla_ansible.run(parsed_args, "command", "overcloud") kolla_ansible.run(parsed_args, "command", "overcloud")
expected_cmd = [ expected_cmd = [
"source", "ansible/kolla-venv/bin/activate", "&&", "source", "/opt/kayobe/venvs/kolla/bin/activate", "&&",
"kolla-ansible", "command", "kolla-ansible", "command",
"--inventory", "/path/to/inventory", "--inventory", "/path/to/inventory",
"--configdir", "/path/to/config", "--configdir", "/path/to/config",
@@ -84,7 +84,7 @@ class TestCase(unittest.TestCase):
parsed_args = parser.parse_args(args) parsed_args = parser.parse_args(args)
kolla_ansible.run(parsed_args, "command", "overcloud") kolla_ansible.run(parsed_args, "command", "overcloud")
expected_cmd = [ expected_cmd = [
"source", "ansible/kolla-venv/bin/activate", "&&", "source", "/opt/kayobe/venvs/kolla/bin/activate", "&&",
"kolla-ansible", "command", "kolla-ansible", "command",
"--inventory", "/path/to/inventory", "--inventory", "/path/to/inventory",
"--configdir", "/path/to/config", "--configdir", "/path/to/config",
@@ -107,7 +107,7 @@ class TestCase(unittest.TestCase):
parsed_args = parser.parse_args(args) parsed_args = parser.parse_args(args)
kolla_ansible.run(parsed_args, "command", "overcloud") kolla_ansible.run(parsed_args, "command", "overcloud")
expected_cmd = [ expected_cmd = [
"source", "ansible/kolla-venv/bin/activate", "&&", "source", "/opt/kayobe/venvs/kolla/bin/activate", "&&",
"kolla-ansible", "command", "kolla-ansible", "command",
"--key", "/path/to/vault/pw", "--key", "/path/to/vault/pw",
"--inventory", "/etc/kolla/inventory/overcloud", "--inventory", "/etc/kolla/inventory/overcloud",
@@ -130,7 +130,7 @@ class TestCase(unittest.TestCase):
parsed_args = parser.parse_args([]) parsed_args = parser.parse_args([])
kolla_ansible.run(parsed_args, "command", "overcloud") kolla_ansible.run(parsed_args, "command", "overcloud")
expected_cmd = [ expected_cmd = [
"source", "ansible/kolla-venv/bin/activate", "&&", "source", "/opt/kayobe/venvs/kolla/bin/activate", "&&",
"kolla-ansible", "command", "kolla-ansible", "command",
"--key", "/path/to/kayobe-vault-password-helper", "--key", "/path/to/kayobe-vault-password-helper",
"--inventory", "/etc/kolla/inventory/overcloud", "--inventory", "/etc/kolla/inventory/overcloud",
@@ -157,7 +157,7 @@ class TestCase(unittest.TestCase):
} }
kolla_ansible.run(parsed_args, "command", "overcloud", **kwargs) kolla_ansible.run(parsed_args, "command", "overcloud", **kwargs)
expected_cmd = [ expected_cmd = [
"source", "ansible/kolla-venv/bin/activate", "&&", "source", "/opt/kayobe/venvs/kolla/bin/activate", "&&",
"kolla-ansible", "command", "kolla-ansible", "command",
"-v", "-v",
"--inventory", "/etc/kolla/inventory/overcloud", "--inventory", "/etc/kolla/inventory/overcloud",