Merge ~larsks/cloud-init:lp/1658200 into cloud-init:master

Proposed by Lars Kellogg-Stedman
Status: Merged
Merged at revision: d3fbb5df017c7a6e0eb1a146d970db260932d7e8
Proposed branch: ~larsks/cloud-init:lp/1658200
Merge into: cloud-init:master
Diff against target: 10 lines (+1/-0)
1 file modified
tests/unittests/test_datasource/ (+1/-0)
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email:
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/unittests/test_datasource/ b/tests/unittests/test_datasource/
2index 4f66767..44441e7 100644
3--- a/tests/unittests/test_datasource/
4+++ b/tests/unittests/test_datasource/
5@@ -59,6 +59,7 @@ def _set_mock_metadata(gce_meta=None):
6 else:
7 return (404, headers, '')
9+ httpretty.reset()
10 httpretty.register_uri(httpretty.GET, MD_URL_RE, body=_request_callback)


People subscribed via source and target branches