From ea125c171521d94259d5bc959cdf1f2aabeb117b Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Wed, 20 Jan 2021 16:04:53 +0100 Subject: [PATCH] Paths no longer contain double '/' Paths created trough formatted string included double '/'. While still parsable, and as far as I know posix valid, it is nonetheless a bit confusing. This change merely removes one of the '/', resulting in path that is just as valid, just easier on the eye. Tests were adjusted to reflect the change. Signed-off-by: Jiri Podivin Change-Id: Ic6bf6d0a02bead00c0e3c5a858476cf5f7c0d2a7 --- validations_libs/constants.py | 2 +- validations_libs/tests/cli/test_run.py | 18 +++++++++--------- .../tests/test_validation_actions.py | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/validations_libs/constants.py b/validations_libs/constants.py index a96e119d..d0f861b2 100644 --- a/validations_libs/constants.py +++ b/validations_libs/constants.py @@ -14,7 +14,7 @@ # import os -DEFAULT_VALIDATIONS_BASEDIR = '/usr/share/ansible/' +DEFAULT_VALIDATIONS_BASEDIR = '/usr/share/ansible' ANSIBLE_VALIDATION_DIR = '/usr/share/ansible/validation-playbooks' diff --git a/validations_libs/tests/cli/test_run.py b/validations_libs/tests/cli/test_run.py index da718f8e..370c0229 100644 --- a/validations_libs/tests/cli/test_run.py +++ b/validations_libs/tests/cli/test_run.py @@ -71,7 +71,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': {'key': 'value'}, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': None, 'python_interpreter': sys.executable, @@ -101,7 +101,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': {'key': 'value2'}, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': None, 'python_interpreter': sys.executable, @@ -143,7 +143,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': {'key': 'value'}, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': None, 'python_interpreter': sys.executable, @@ -171,7 +171,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': None, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': {'key': 'value'}, 'python_interpreter': sys.executable, @@ -201,7 +201,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': None, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': {'ANSIBLE_STDOUT_CALLBACK': 'default'}, 'python_interpreter': sys.executable, @@ -229,7 +229,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': None, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': {'key': 'value2'}, 'python_interpreter': sys.executable, @@ -259,7 +259,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': {'key': 'value'}, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': {'key2': 'value2'}, 'python_interpreter': sys.executable, @@ -298,7 +298,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': {'key': 'value'}, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': {'key2': 'value2'}, 'python_interpreter': sys.executable, @@ -322,7 +322,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': {'key': 'value'}, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': {'key2': 'value2'}, 'python_interpreter': sys.executable, diff --git a/validations_libs/tests/test_validation_actions.py b/validations_libs/tests/test_validation_actions.py index e2a6dbaf..0467df10 100644 --- a/validations_libs/tests/test_validation_actions.py +++ b/validations_libs/tests/test_validation_actions.py @@ -77,7 +77,7 @@ class TestValidationActions(TestCase): run_called_args = { 'workdir': '/tmp/', 'playbook': '/tmp/foo/fake.yaml', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'playbook_dir': '/tmp/foo', 'parallel_run': True, 'inventory': 'tmp/inventory.yaml', @@ -123,7 +123,7 @@ class TestValidationActions(TestCase): run_called_args = { 'workdir': '/tmp/', 'playbook': '/tmp/foo/fake.yaml', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'playbook_dir': '/tmp/foo', 'parallel_run': True, 'inventory': 'tmp/inventory.yaml',