From 18b9c7f29b8925aadeb6ac1ea95c1e1d74e9fa50 Mon Sep 17 00:00:00 2001
From: Robert Collins <robertc@robertcollins.net>
Date: Wed, 14 Nov 2012 06:18:49 +0000
Subject: [PATCH] Isolate tests from the environment variable http_proxy.

This fixes bug 1078548.

This is done by adding a dependency on the fixtures library, which has
dedicated code for just this sort of thing, and using it in the base class.

Change-Id: I841fbf912b1a3ab43ca8c52c779d930aaf4a0e96
---
 nova/test.py        | 2 ++
 tools/test-requires | 1 +
 2 files changed, 3 insertions(+)

diff --git a/nova/test.py b/nova/test.py
index 73956a35c3c2..d8a8ea082850 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."""
diff --git a/tools/test-requires b/tools/test-requires
index fc56d3c87307..b3d4b5a228b4 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -2,6 +2,7 @@
 distribute>=0.6.24
 
 coverage
+fixtures
 mox==0.5.3
 nose
 testtools