Merge pull request #3403 from shanemcd/ootpa

Working out some python3 kinks

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-03-12 16:00:45 +00:00
committed by GitHub
4 changed files with 10 additions and 12 deletions

View File

@@ -173,14 +173,12 @@ def test_extract_ansible_vars():
def test_get_custom_venv_choices():
bundled_venv = os.path.join(settings.BASE_VENV_PATH, 'ansible', '')
bundled_venv_py3 = os.path.join(settings.BASE_VENV_PATH, 'ansible3', '')
assert sorted(common.get_custom_venv_choices()) == [bundled_venv, bundled_venv_py3]
assert sorted(common.get_custom_venv_choices()) == [bundled_venv]
with TemporaryDirectory(dir=settings.BASE_VENV_PATH, prefix='tmp') as temp_dir:
os.makedirs(os.path.join(temp_dir, 'bin', 'activate'))
assert sorted(common.get_custom_venv_choices()) == [
bundled_venv,
bundled_venv_py3,
os.path.join(temp_dir, '')
]