summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2018-03-19 22:52:36 -0700
committerToshio Kuratomi <a.badger@gmail.com>2018-03-19 23:19:42 -0700
commita1abc2788de396600fa8d72b0644b1110c7b17cf (patch)
treeed60f83d02d74e2819d64b50f18c9473e60001b4
parentff8f3120ef3d8ed81709287553cc979f2b3dd34e (diff)
downloadansible-a1abc2788de396600fa8d72b0644b1110c7b17cf.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 d5844b284c..d76fb9d95e 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