diff options
| author | Scott Moser <smoser@brickies.net> | 2017-01-24 11:37:08 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-01-24 15:39:14 -0500 |
| commit | 8e9e47f2f06b4dcf017149699111e94ba7c1830b (patch) | |
| tree | cc075e0497d555d41356a178ecfe958b36fa4c42 /tests/unittests/test_datasource | |
| parent | 853df0a0e85002582694b88db886f206f64b23c7 (diff) | |
| download | vyos-cloud-init-8e9e47f2f06b4dcf017149699111e94ba7c1830b.tar.gz vyos-cloud-init-8e9e47f2f06b4dcf017149699111e94ba7c1830b.zip | |
tests: No longer monkey patch httpretty for python 3.4.2
No shipping ubuntu has a python 3.4 that is less than 3.4.2.
Remove this workaround to avoid unnecessary complexity.
This reverts 04a60cf949.
Diffstat (limited to 'tests/unittests/test_datasource')
| -rw-r--r-- | tests/unittests/test_datasource/test_gce.py | 2 | ||||
| -rw-r--r-- | tests/unittests/test_datasource/test_openstack.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py index a5cced07..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', diff --git a/tests/unittests/test_datasource/test_openstack.py b/tests/unittests/test_datasource/test_openstack.py index 28e1833e..7bf55084 100644 --- a/tests/unittests/test_datasource/test_openstack.py +++ b/tests/unittests/test_datasource/test_openstack.py @@ -5,6 +5,7 @@ # This file is part of cloud-init. See LICENSE file for license information. import copy +import httpretty as hp import json import re @@ -20,8 +21,6 @@ from cloudinit.sources import DataSourceOpenStack as ds from cloudinit.sources.helpers import openstack from cloudinit import util -hp = test_helpers.import_httpretty() - BASE_URL = "http://169.254.169.254" PUBKEY = u'ssh-rsa AAAAB3NzaC1....sIkJhq8wdX+4I3A4cYbYP ubuntu@server-460\n' EC2_META = { |