diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-07-24 08:49:42 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-07-24 08:49:42 -0400 |
| commit | 84ee0821f32c652fd377663c2e73658437ae99ab (patch) | |
| tree | cbebe02dbaa15307c9992d068a714613be2fdce1 /tests/unittests/test_datasource | |
| parent | a000671207ee4a445261b05d22c2f3357b413053 (diff) | |
| parent | 27ce1e10692e93cfb9b87df547de4e0930ec4d28 (diff) | |
| download | vyos-cloud-init-84ee0821f32c652fd377663c2e73658437ae99ab.tar.gz vyos-cloud-init-84ee0821f32c652fd377663c2e73658437ae99ab.zip | |
merge from trunk
Diffstat (limited to 'tests/unittests/test_datasource')
| -rw-r--r-- | tests/unittests/test_datasource/test_gce.py | 3 | ||||
| -rw-r--r-- | tests/unittests/test_datasource/test_openstack.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py index 405dfbdb..60a0ce48 100644 --- a/tests/unittests/test_datasource/test_gce.py +++ b/tests/unittests/test_datasource/test_gce.py @@ -55,12 +55,13 @@ def _request_callback(method, uri, headers): return (404, headers, '') -class TestDataSourceGCE(test_helpers.TestCase): +class TestDataSourceGCE(test_helpers.HttprettyTestCase): def setUp(self): self.ds = DataSourceGCE.DataSourceGCE( settings.CFG_BUILTIN, None, helpers.Paths({})) + super(TestDataSourceGCE, self).setUp() @httpretty.activate def test_connection(self): diff --git a/tests/unittests/test_datasource/test_openstack.py b/tests/unittests/test_datasource/test_openstack.py index c5298aaa..c088bb55 100644 --- a/tests/unittests/test_datasource/test_openstack.py +++ b/tests/unittests/test_datasource/test_openstack.py @@ -121,7 +121,7 @@ def _register_uris(version, ec2_files, ec2_meta, os_files): body=get_request_callback) -class TestOpenStackDataSource(test_helpers.TestCase): +class TestOpenStackDataSource(test_helpers.HttprettyTestCase): VERSION = 'latest' @hp.activate |