summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-14 15:54:48 +0000
committerGerrit Code Review <review@openstack.org>2012-11-14 15:54:48 +0000
commitaa87ccc74ee366a6cc9763855f78c0f65e18086b (patch)
tree09d9a5756ba8658622d9004f7252b86c32c50440 /nova
parent0fadce2d59b2a77b9b5745dd1ca60e9a4f555d24 (diff)
parent18b9c7f29b8925aadeb6ac1ea95c1e1d74e9fa50 (diff)
downloadnova-aa87ccc74ee366a6cc9763855f78c0f65e18086b.tar.gz
nova-aa87ccc74ee366a6cc9763855f78c0f65e18086b.tar.xz
nova-aa87ccc74ee366a6cc9763855f78c0f65e18086b.zip
Merge "Isolate tests from the environment variable http_proxy."
Diffstat (limited to 'nova')
-rw-r--r--nova/test.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/test.py b/nova/test.py
index 73956a35c..d8a8ea082 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -26,6 +26,7 @@ inline callbacks.
import sys
import uuid
+from fixtures import EnvironmentVariable
import mox
import stubout
import testtools
@@ -82,6 +83,7 @@ class TestCase(testtools.TestCase):
self.injected = []
self._services = []
self._modules = {}
+ self.useFixture(EnvironmentVariable('http_proxy'))
def tearDown(self):
"""Runs after each test method to tear down test environment."""