diff --git a/roles/wsgi_website/molecule/default/tests/test_default.py b/roles/wsgi_website/molecule/default/tests/test_default.py index f3472421c998c5df9258710cc176f015cd9b8034..6c3c77eef198ee85b80a568dc099c6268551e1b3 100644 --- a/roles/wsgi_website/molecule/default/tests/test_default.py +++ b/roles/wsgi_website/molecule/default/tests/test_default.py @@ -273,16 +273,16 @@ def test_python_virtualenv_wrapper_script(host, wrapper_script, expected_owner, @pytest.mark.parametrize("admin_user, pip_path, expected_packages", [ ('admin-parameters-mandatory', '/var/www/parameters-mandatory/virtualenv/bin/pip', [ - "futures==3.3.0", - "gunicorn==19.10.0", + "gunicorn==21.2.0", + "packaging==23.2", ]), ('admin-parameters-optional_local', '/var/www/parameters-optional.local/virtualenv/bin/pip', [ "Pygments==2.2.0", "dnspython==1.15.0", "docopt==0.6.2", - "futures==3.1.1", - "gunicorn==20.0.4", + "gunicorn==21.1.0", "jedi==0.13.1", + "packaging==23.2", "parso==0.3.1", "prompt-toolkit==1.0.15", "ptpython==0.41", @@ -298,9 +298,9 @@ def test_python_virtualenv_wrapper_script(host, wrapper_script, expected_owner, "PasteScript==2.0.2", "Werkzeug==0.12.2", "click==6.7", - "futures==3.1.1", - "gunicorn==19.8.1", + "gunicorn==21.1.0", "itsdangerous==0.24", + "packaging==23.2", "six==1.10.0", ]), ]) @@ -496,9 +496,9 @@ def test_website_enabled(host, config_file, expected_content): @pytest.mark.parametrize("python_path, expected_version", [ - ("/var/www/parameters-mandatory/virtualenv/bin/python", "Python 2"), + ("/var/www/parameters-mandatory/virtualenv/bin/python", "Python 3"), ("/var/www/parameters-optional.local/virtualenv/bin/python", "Python 3"), - ("/var/www/parameters-paste-req/virtualenv/bin/python", "Python 2"), + ("/var/www/parameters-paste-req/virtualenv/bin/python", "Python 3"), ]) def test_python_version_in_virtualenv(host, python_path, expected_version): """ @@ -518,9 +518,9 @@ def test_python_version_in_virtualenv(host, python_path, expected_version): @pytest.mark.parametrize("fqdn, pip_check_requirements_upgrades_directory, expected_requirements_in, expected_requirements", [ - ("parameters-mandatory", "/etc/pip_check_requirements_upgrades", ["futures", "gunicorn"], ["futures==3.3.0", "gunicorn==19.10.0"]), - ("parameters-optional.local", "/etc/pip_check_requirements_upgrades-py3", ["gunicorn"], ["futures==3.1.1", "gunicorn==20.0.4"]), - ("parameters-paste-req", "/etc/pip_check_requirements_upgrades", ["futures", "gunicorn"], ["futures==3.1.1", "gunicorn==19.8.1"]), + ("parameters-mandatory", "/etc/pip_check_requirements_upgrades", ["gunicorn"], ["gunicorn==21.2.0", "packaging==23.2"]), + ("parameters-optional.local", "/etc/pip_check_requirements_upgrades", ["gunicorn"], ["gunicorn==21.1.0", "packaging==23.2"]), + ("parameters-paste-req", "/etc/pip_check_requirements_upgrades", ["gunicorn"], ["gunicorn==21.1.0", "packaging==23.2"]), ]) def test_wsgi_requirements(host, fqdn, pip_check_requirements_upgrades_directory, expected_requirements_in, expected_requirements): """