Merge "Return absolute path for inventory"

This commit is contained in:
Zuul 2021-02-25 17:51:04 +00:00 committed by Gerrit Code Review
commit a5fcd54131
2 changed files with 6 additions and 5 deletions

View File

@ -66,7 +66,7 @@ class Ansible(object):
if isinstance(inventory, six.string_types):
# check is file path
if os.path.exists(inventory):
return inventory
return os.path.abspath(inventory)
elif isinstance(inventory, dict):
inventory = yaml.safe_dump(
inventory,

View File

@ -170,9 +170,10 @@ class TestAnsible(TestCase):
@mock.patch('validations_libs.ansible.Ansible._ansible_env_var',
return_value={'ANSIBLE_STDOUT_CALLBACK': 'fake.py'})
@mock.patch('os.environ.copy', return_value={})
def test_run_specific_log_path(self, mock_env, mock_env_var, mock_config,
mock_dump_artifact, mock_run, mock_mkdirs,
mock_exists, mock_open):
@mock.patch('os.path.abspath', return_value='/tmp/foo/localhost')
def test_run_specific_log_path(self, moch_path, mock_env, mock_env_var,
mock_config, mock_dump_artifact, mock_run,
mock_mkdirs, mock_exists, mock_open):
_playbook, _rc, _status = self.run.run(
playbook='existing.yaml',
inventory='localhost,',
@ -184,7 +185,7 @@ class TestAnsible(TestCase):
'artifact_dir': '/tmp',
'extravars': {},
'ident': '',
'inventory': 'localhost,',
'inventory': '/tmp/foo/localhost',
'playbook': 'existing.yaml',
'private_data_dir': '/tmp',
'quiet': False,