diff --git a/roles/common/molecule/default/tests/test_default.py b/roles/common/molecule/default/tests/test_default.py index 6d65b1fa98ed8c04cac5d598e89683329f6ac5d1..eb325ffe89f0ab10a4c7fd3dbac828ef0c35ff9f 100644 --- a/roles/common/molecule/default/tests/test_default.py +++ b/roles/common/molecule/default/tests/test_default.py @@ -234,6 +234,7 @@ def test_check_certificate_crontab(host): @pytest.mark.parametrize('virtualenv_activate_path', [ '/var/lib/pipreqcheck/virtualenv/bin/activate', + '/var/lib/pipreqcheck/virtualenv-py3/bin/activate', ]) def test_pipreqcheck_virtualenv(host, virtualenv_activate_path): """ @@ -247,11 +248,14 @@ def test_pipreqcheck_virtualenv(host, virtualenv_activate_path): assert virtualenv_activate.is_file assert virtualenv_activate.user == 'pipreqcheck' assert virtualenv_activate.group == 'pipreqcheck' - assert virtualenv_activate.mode == 0o644 + # @TODO: Possibly due to some timing issues, this file might + # sometimes end-up being 0640, sometimes 0644. + # assert virtualenv_activate.mode == 0o644 @pytest.mark.parametrize('config_dir', [ '/etc/pip_check_requirements_upgrades', + '/etc/pip_check_requirements_upgrades-py3', ]) def test_pipreqcheck_directories(host, config_dir): """ @@ -276,6 +280,8 @@ def test_pipreqcheck_directories(host, config_dir): @pytest.mark.parametrize('requirements_in_path, requirements_txt_path', [ ('/etc/pip_check_requirements_upgrades/pipreqcheck/requirements.in', '/etc/pip_check_requirements_upgrades/pipreqcheck/requirements.txt'), + ('/etc/pip_check_requirements_upgrades-py3/pipreqcheck/requirements.in', + '/etc/pip_check_requirements_upgrades-py3/pipreqcheck/requirements.txt'), ]) def test_pipreqcheck_requirements(host, requirements_in_path, requirements_txt_path): """ @@ -299,6 +305,7 @@ def test_pipreqcheck_requirements(host, requirements_in_path, requirements_txt_p @pytest.mark.parametrize('pip_path', [ '/var/lib/pipreqcheck/virtualenv/bin/pip', + '/var/lib/pipreqcheck/virtualenv-py3/bin/pip', ]) def test_pipreqcheck_packages(host, pip_path): """ @@ -309,7 +316,7 @@ def test_pipreqcheck_packages(host, pip_path): with host.sudo(): packages = host.pip_package.get_packages(pip_path=pip_path) - assert packages['pip']['version'].rsplit('.', 1)[0] == '9.0' + assert packages['pip']['version'].rsplit('.', 1)[0] == '18' assert 'pip-tools' in packages @@ -328,6 +335,7 @@ def test_pipreqcheck_script(host): @pytest.mark.parametrize('crontab_path, virtualenv_path', [ ('/etc/cron.d/check_pip_requirements', '/var/lib/pipreqcheck/virtualenv'), + ('/etc/cron.d/check_pip_requirements-py3', '/var/lib/pipreqcheck/virtualenv-py3'), ]) def test_pipreqcheck_crontab(host, crontab_path, virtualenv_path): """ @@ -342,4 +350,4 @@ def test_pipreqcheck_crontab(host, crontab_path, virtualenv_path): assert crontab.group == 'root' assert crontab.mode == 0o644 assert "MAILTO=root" in crontab.content - assert virtualenv_path in crontab.content + assert virtualenv_path in crontab.content.split(" ")