diff options
| author | Scott Moser <smoser@brickies.net> | 2017-03-03 02:26:38 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-03-03 02:26:38 -0500 |
| commit | d7004bcf269fe60e456de336ecda9a9d2fe50bfd (patch) | |
| tree | cf49b1fbc06388d46fa435814d24d97c83476047 /tests/unittests/test_datasource/test_gce.py | |
| parent | 1de8720effd029727bb5ef7972e7e4d859a1b53a (diff) | |
| parent | c81ea53bbdc4ada9d2b52430e106aeb3c38b4e0a (diff) | |
| download | vyos-cloud-init-d7004bcf269fe60e456de336ecda9a9d2fe50bfd.tar.gz vyos-cloud-init-d7004bcf269fe60e456de336ecda9a9d2fe50bfd.zip | |
merge from master at 0.7.9-47-gc81ea53
Diffstat (limited to 'tests/unittests/test_datasource/test_gce.py')
| -rw-r--r-- | tests/unittests/test_datasource/test_gce.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py index 4f667678..4f83454e 100644 --- a/tests/unittests/test_datasource/test_gce.py +++ b/tests/unittests/test_datasource/test_gce.py @@ -4,6 +4,7 @@ # # This file is part of cloud-init. See LICENSE file for license information. +import httpretty import re from base64 import b64encode, b64decode @@ -15,7 +16,6 @@ from cloudinit.sources import DataSourceGCE from .. import helpers as test_helpers -httpretty = test_helpers.import_httpretty() GCE_META = { 'instance/id': '123', @@ -59,6 +59,8 @@ def _set_mock_metadata(gce_meta=None): else: 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) |