From 972bcfe7eb995fc0d6b6446b30f39841b50ada6f Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 21 Feb 2022 23:39:41 -0800 Subject: [PATCH] Fix integration tests that install MarkupSafe. --- test/integration/targets/filter_urls/runme.sh | 2 +- test/integration/targets/groupby_filter/runme.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/targets/filter_urls/runme.sh b/test/integration/targets/filter_urls/runme.sh index f6460acb33b..2ed1cd8452c 100755 --- a/test/integration/targets/filter_urls/runme.sh +++ b/test/integration/targets/filter_urls/runme.sh @@ -16,7 +16,7 @@ pip install 'setuptools<45' # Install Jinja 2.6 since we want to test the fallback to Ansible's custom # urlencode functions. Jinja 2.6 does not have urlencode so we will trigger the # fallback. -pip install 'jinja2 >= 2.6, < 2.7' +pip install 'jinja2 >= 2.6, < 2.7' 'markupsafe < 2.1' # Run the playbook again in the venv with Jinja 2.6 ansible-playbook runme.yml "$@" diff --git a/test/integration/targets/groupby_filter/runme.sh b/test/integration/targets/groupby_filter/runme.sh index 09b47d55b0e..9c9c6f03558 100755 --- a/test/integration/targets/groupby_filter/runme.sh +++ b/test/integration/targets/groupby_filter/runme.sh @@ -7,10 +7,10 @@ source virtualenv.sh # Update pip in the venv to a version that supports constraints pip install --requirement requirements.txt -pip install -U jinja2==2.9.4 --constraint "../../../lib/ansible_test/_data/requirements/constraints.txt" +pip install -U jinja2==2.9.4 "markupsafe<2.1.0" --constraint "../../../lib/ansible_test/_data/requirements/constraints.txt" ansible-playbook -i ../../inventory test_jinja2_groupby.yml -v "$@" -pip install -U "jinja2<2.9.0" --constraint "../../../lib/ansible_test/_data/requirements/constraints.txt" +pip install -U "jinja2<2.9.0" "markupsafe<2.1.0" --constraint "../../../lib/ansible_test/_data/requirements/constraints.txt" ansible-playbook -i ../../inventory test_jinja2_groupby.yml -v "$@"