summaryrefslogtreecommitdiff
path: root/tests/unittests/test_datasource/test_gce.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2018-05-23 16:04:42 -0400
committerScott Moser <smoser@brickies.net>2018-05-23 16:04:42 -0400
commit12799d96f85e210c8e1216a3b06d8a98468fedd7 (patch)
tree54ab97e70752447a112f491c3fc1e10cbeb9bbec /tests/unittests/test_datasource/test_gce.py
parent3b28bdc616f3e7f4d6b419629dc7b9efc3ae8d1e (diff)
downloadvyos-cloud-init-12799d96f85e210c8e1216a3b06d8a98468fedd7.tar.gz
vyos-cloud-init-12799d96f85e210c8e1216a3b06d8a98468fedd7.zip
tests: Avoid using https in httpretty, improve HttPretty test case.
On OpenSuSE 42.3, we would get errors running tests/unittests/test_handler/test_handler_chef.py  - test_myhttps_nonet raises a UnmockedError    No mocking was registered, and real connections are not allowed  - test_myhttps_net raises SSLError    ("bad handshake: SysCallError(32, 'EPIPE')",) This fixes the errors by just using http instead of https. Also it modifies the HttprettyTestCase to do the httpretty activate and deactivate itself in setUp and tearDown. Then we don't have to decorate individual test_ methods. Also, we set    httpretty.HTTPretty.allow_net_connect = False Test cases here should not reach out to a network resource. LP: #1771659
Diffstat (limited to 'tests/unittests/test_datasource/test_gce.py')
-rw-r--r--tests/unittests/test_datasource/test_gce.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py
index eb3cec42..41176c6a 100644
--- a/tests/unittests/test_datasource/test_gce.py
+++ b/tests/unittests/test_datasource/test_gce.py
@@ -78,7 +78,6 @@ def _set_mock_metadata(gce_meta=None):
return (404, headers, '')
# reset is needed. https://github.com/gabrielfalcao/HTTPretty/issues/316
- httpretty.reset()
httpretty.register_uri(httpretty.GET, MD_URL_RE, body=_request_callback)