fix httpretty based test cases if http_proxy is set.

previously this would fail:
  http_proxy=http://foo.bar make test

now it will pass.  This works around a bug where httpretty is not able to
patch http operations if http_proxy is set.

https://github.com/gabrielfalcao/HTTPretty/issues/122

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 1979a0de..19ffb6c1 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 3a64430a..d29e5363 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