From a3d1b07652e8f3d07078b8d0d7d8dc05b3331a4e Mon Sep 17 00:00:00 2001 From: John Garbutt Date: Thu, 17 Aug 2017 17:22:27 +0100 Subject: [PATCH] Fix kolla-ansible unit test failures Seems like default path was changed and broke the tests: 19ceec45cd36c6b086c519a183e545db0a811e3e --- kayobe/tests/unit/test_kolla_ansible.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kayobe/tests/unit/test_kolla_ansible.py b/kayobe/tests/unit/test_kolla_ansible.py index 70ab888b0..87a62b54d 100644 --- a/kayobe/tests/unit/test_kolla_ansible.py +++ b/kayobe/tests/unit/test_kolla_ansible.py @@ -35,7 +35,7 @@ class TestCase(unittest.TestCase): parsed_args = parser.parse_args([]) kolla_ansible.run(parsed_args, "command", "overcloud") expected_cmd = [ - "source", "ansible/kolla-venv/bin/activate", "&&", + "source", "/opt/kayobe/venvs/kolla/bin/activate", "&&", "kolla-ansible", "command", "--inventory", "/etc/kolla/inventory/overcloud", ] @@ -57,7 +57,7 @@ class TestCase(unittest.TestCase): parsed_args = parser.parse_args(args) kolla_ansible.run(parsed_args, "command", "overcloud") expected_cmd = [ - "source", "ansible/kolla-venv/bin/activate", "&&", + "source", "/opt/kayobe/venvs/kolla/bin/activate", "&&", "kolla-ansible", "command", "--inventory", "/path/to/inventory", "--configdir", "/path/to/config", @@ -84,7 +84,7 @@ class TestCase(unittest.TestCase): parsed_args = parser.parse_args(args) kolla_ansible.run(parsed_args, "command", "overcloud") expected_cmd = [ - "source", "ansible/kolla-venv/bin/activate", "&&", + "source", "/opt/kayobe/venvs/kolla/bin/activate", "&&", "kolla-ansible", "command", "--inventory", "/path/to/inventory", "--configdir", "/path/to/config", @@ -107,7 +107,7 @@ class TestCase(unittest.TestCase): parsed_args = parser.parse_args(args) kolla_ansible.run(parsed_args, "command", "overcloud") expected_cmd = [ - "source", "ansible/kolla-venv/bin/activate", "&&", + "source", "/opt/kayobe/venvs/kolla/bin/activate", "&&", "kolla-ansible", "command", "--key", "/path/to/vault/pw", "--inventory", "/etc/kolla/inventory/overcloud", @@ -130,7 +130,7 @@ class TestCase(unittest.TestCase): parsed_args = parser.parse_args([]) kolla_ansible.run(parsed_args, "command", "overcloud") expected_cmd = [ - "source", "ansible/kolla-venv/bin/activate", "&&", + "source", "/opt/kayobe/venvs/kolla/bin/activate", "&&", "kolla-ansible", "command", "--key", "/path/to/kayobe-vault-password-helper", "--inventory", "/etc/kolla/inventory/overcloud", @@ -157,7 +157,7 @@ class TestCase(unittest.TestCase): } kolla_ansible.run(parsed_args, "command", "overcloud", **kwargs) expected_cmd = [ - "source", "ansible/kolla-venv/bin/activate", "&&", + "source", "/opt/kayobe/venvs/kolla/bin/activate", "&&", "kolla-ansible", "command", "-v", "--inventory", "/etc/kolla/inventory/overcloud",