openstack
/
validations-libs
Code Issues Proposed changes

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 <jpodivin@redhat.com>
Change-Id: Ic6bf6d0a02bead00c0e3c5a858476cf5f7c0d2a7
This commit is contained in:
Jiri Podivin 2021-01-20 16:04:53 +01:00
parent 0f00fd79f9
commit ea125c1715
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
validations_libs/constants.py
View File

@ -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'

18
validations_libs/tests/cli/test_run.py
View File

@ -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,

4
validations_libs/tests/test_validation_actions.py
View File

@ -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',