openstack/cinder
Code Issues Proposed changes

Merge "Ignore HTTP_PROXY during test requests"

Browse Source
This commit is contained in:
Jenkins 2014-08-16 04:48:35 +00:00 committed by Gerrit Code Review
commit 9118c996ce
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/tests/integrated/integrated_helpers.py
View File

@ -21,6 +21,8 @@ import random
import string
import uuid
import fixtures
from cinder.openstack.common import log as logging
from cinder import service
from cinder import test # For the flags
@ -62,6 +64,9 @@ class _IntegratedTestBase(test.TestCase):
self.flags(**f)
self.flags(verbose=True)
for var in ('http_proxy', 'HTTP_PROXY'):
self.useFixture(fixtures.EnvironmentVariable(var))
# set up services
self.volume = self.start_service('volume')
self.scheduler = self.start_service('scheduler')

11
cinder/tests/test_wsgi.py
View File

@ -39,6 +39,11 @@ TEST_VAR_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
'var'))
def open_no_proxy(*args, **kwargs):
opener = urllib2.build_opener(urllib2.ProxyHandler({}))
return opener.open(*args, **kwargs)
class TestLoaderNothingExists(test.TestCase):
"""Loader tests where os.path.exists always returns False."""
@ -134,7 +139,7 @@ class TestWSGIServer(test.TestCase):
host="127.0.0.1", port=0)
server.start()
response = urllib2.urlopen('http://127.0.0.1:%d/' % server.port)
response = open_no_proxy('http://127.0.0.1:%d/' % server.port)
self.assertEqual(greetings, response.read())
server.stop()
@ -156,7 +161,7 @@ class TestWSGIServer(test.TestCase):
server.start()
response = urllib2.urlopen('https://127.0.0.1:%d/' % server.port)
response = open_no_proxy('https://127.0.0.1:%d/' % server.port)
self.assertEqual(greetings, response.read())
server.stop()
@ -181,7 +186,7 @@ class TestWSGIServer(test.TestCase):
port=0)
server.start()
response = urllib2.urlopen('https://[::1]:%d/' % server.port)
response = open_no_proxy('https://[::1]:%d/' % server.port)
self.assertEqual(greetings, response.read())
server.stop()