summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2018-03-19 22:52:36 -0700
committerMatt Clay <matt@mystile.com>2018-03-19 23:15:16 -0700
commit02f3eed0e93f3151db93b96558a67a4c084b3ba2 (patch)
treecc1b497df7b490b295a7daa97040c58d31d909f3
parentaea7abcb15f386e344d2908429abd329324d04ba (diff)
downloadansible-02f3eed0e93f3151db93b96558a67a4c084b3ba2.tar.gz
Fix uri test on Python 2.6.
(cherry picked from commit 1fd9a616a460f379f302e5d20d10ae1d1f27517e)
-rw-r--r--test/integration/targets/uri/files/constraints.txt1
-rw-r--r--test/integration/targets/uri/tasks/main.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/test/integration/targets/uri/files/constraints.txt b/test/integration/targets/uri/files/constraints.txt
new file mode 100644
index 0000000000..309ba28c5c
--- /dev/null
+++ b/test/integration/targets/uri/files/constraints.txt
@@ -0,0 +1 @@
+cryptography < 2.2 ; python_version < "2.7" # cryptography 2.2+ requires python 2.7+
diff --git a/test/integration/targets/uri/tasks/main.yml b/test/integration/targets/uri/tasks/main.yml
index b8a15bd2ab..0e7dcf7358 100644
--- a/test/integration/targets/uri/tasks/main.yml
+++ b/test/integration/targets/uri/tasks/main.yml
@@ -285,6 +285,7 @@
pip:
name: "{{ item }}"
state: latest
+ extra_args: "-c {{ role_path }}/files/constraints.txt"
with_items:
- urllib3
- PyOpenSSL