summaryrefslogtreecommitdiff
path: root/tests/unittests/test_ec2_util.py
diff options
context:
space:
mode:
authorDaniel Watkins <daniel.watkins@canonical.com>2015-03-04 12:29:29 +0000
committerDaniel Watkins <daniel.watkins@canonical.com>2015-03-04 12:29:29 +0000
commit04a60cf949e085f06fa1f93b39a74b8d288f0e2e (patch)
treebfc12529adefacd279aa784041d8ffd19fe117b6 /tests/unittests/test_ec2_util.py
parent48297d2a5d5cd41286135e6c17b37e67fc1bc40d (diff)
downloadvyos-cloud-init-04a60cf949e085f06fa1f93b39a74b8d288f0e2e.tar.gz
vyos-cloud-init-04a60cf949e085f06fa1f93b39a74b8d288f0e2e.zip
Fix hang caused by HTTPretty on Python 3.4.2.
HTTPretty can causes hangs on Python 3.4.2 (and maybe Python 3.4.1), due to a Python bug (fixed in Python 3.4.3). This works around the problem in the appropriate Python versions. See https://github.com/gabrielfalcao/HTTPretty/pull/193 and https://github.com/gabrielfalcao/HTTPretty/issues/221 for details.
Diffstat (limited to 'tests/unittests/test_ec2_util.py')
-rw-r--r--tests/unittests/test_ec2_util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unittests/test_ec2_util.py b/tests/unittests/test_ec2_util.py
index bd43accf..99fc54be 100644
--- a/tests/unittests/test_ec2_util.py
+++ b/tests/unittests/test_ec2_util.py
@@ -3,7 +3,7 @@ from . import helpers
from cloudinit import ec2_utils as eu
from cloudinit import url_helper as uh
-import httpretty as hp
+hp = helpers.import_httpretty()
class TestEc2Util(helpers.HttprettyTestCase):