openstack/aodh
Code Issues Proposed changes

Merge "Use swob instead of webob in swift unit tests"

Browse Source
This commit is contained in:
Jenkins
2014-04-06 14:47:44 +00:00
committed by Gerrit Code Review
parent 7cdcc8c3ec 8a0be11dd2
commit e07c067d67
2 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ceilometer/objectstore/swift_middleware.py
View File

@@ -41,15 +41,14 @@ reseller_prefix = AUTH_
from __future__ import absolute_import
from swift.common import utils
import webob
REQUEST = webob
try:
# Swift >= 1.7.5
import swift.common.swob
REQUEST = swift.common.swob
except ImportError:
pass
import webob
REQUEST = webob
try:
# Swift > 1.7.5 ... module exists but doesn't contain class.

37
ceilometer/tests/objectstore/test_swift_middleware.py
View File

@@ -20,7 +20,13 @@
import six
import mock
try:
# Swift >= 1.7.5
import swift.common.swob
REQUEST = swift.common.swob
except ImportError:
import webob
REQUEST = webob
from ceilometer.objectstore import swift_middleware
from ceilometer.openstack.common.fixture import config
@@ -80,7 +86,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
def test_get(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(), {})
req = webob.Request.blank('/1.0/account/container/obj',
req = REQUEST.Request.blank('/1.0/account/container/obj',
environ={'REQUEST_METHOD': 'GET'})
resp = app(req.environ, self.start_response)
self.assertEqual(["This string is 28 bytes long"], list(resp))
@@ -100,7 +106,8 @@ class TestSwiftMiddleware(test.BaseTestCase):
def test_put(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(body=['']), {})
req = webob.Request.blank('/1.0/account/container/obj',
req = REQUEST.Request.blank(
'/1.0/account/container/obj',
environ={'REQUEST_METHOD': 'PUT',
'wsgi.input':
six.moves.cStringIO('some stuff')})
@@ -121,7 +128,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
def test_post(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(body=['']), {})
req = webob.Request.blank(
req = REQUEST.Request.blank(
'/1.0/account/container/obj',
environ={'REQUEST_METHOD': 'POST',
'wsgi.input': six.moves.cStringIO('some other stuff')})
@@ -142,7 +149,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
def test_head(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(body=['']), {})
req = webob.Request.blank('/1.0/account/container/obj',
req = REQUEST.Request.blank('/1.0/account/container/obj',
environ={'REQUEST_METHOD': 'HEAD'})
list(app(req.environ, self.start_response))
samples = self.pipeline_manager.pipelines[0].samples
@@ -159,7 +166,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
def test_bogus_request(self):
"""Test even for arbitrary request method, this will still work."""
app = swift_middleware.CeilometerMiddleware(FakeApp(body=['']), {})
req = webob.Request.blank('/1.0/account/container/obj',
req = REQUEST.Request.blank('/1.0/account/container/obj',
environ={'REQUEST_METHOD': 'BOGUS'})
list(app(req.environ, self.start_response))
samples = self.pipeline_manager.pipelines[0].samples
@@ -176,7 +183,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
def test_get_container(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(), {})
req = webob.Request.blank('/1.0/account/container',
req = REQUEST.Request.blank('/1.0/account/container',
environ={'REQUEST_METHOD': 'GET'})
list(app(req.environ, self.start_response))
samples = self.pipeline_manager.pipelines[0].samples
@@ -189,7 +196,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
def test_no_metadata_headers(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(), {})
req = webob.Request.blank('/1.0/account/container',
req = REQUEST.Request.blank('/1.0/account/container',
environ={'REQUEST_METHOD': 'GET'})
list(app(req.environ, self.start_response))
samples = self.pipeline_manager.pipelines[0].samples
@@ -206,7 +213,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
app = swift_middleware.CeilometerMiddleware(FakeApp(), {
'metadata_headers': 'X_VAR1, x-var2, x-var3'
})
req = webob.Request.blank('/1.0/account/container',
req = REQUEST.Request.blank('/1.0/account/container',
environ={'REQUEST_METHOD': 'GET'},
headers={'X_VAR1': 'value1',
'X_VAR2': 'value2'})
@@ -230,7 +237,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
app = swift_middleware.CeilometerMiddleware(FakeApp(), {
'metadata_headers': 'x-var3'
})
req = webob.Request.blank('/1.0/account/container',
req = REQUEST.Request.blank('/1.0/account/container',
environ={'REQUEST_METHOD': 'GET'})
list(app(req.environ, self.start_response))
samples = self.pipeline_manager.pipelines[0].samples
@@ -245,7 +252,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
def test_bogus_path(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(), {})
req = webob.Request.blank('//v1/account/container',
req = REQUEST.Request.blank('/5.0//',
environ={'REQUEST_METHOD': 'GET'})
list(app(req.environ, self.start_response))
samples = self.pipeline_manager.pipelines[0].samples
@@ -253,7 +260,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
def test_missing_resource_id(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(), {})
req = webob.Request.blank('/5.0/', environ={'REQUEST_METHOD': 'GET'})
req = REQUEST.Request.blank('/v1/', environ={'REQUEST_METHOD': 'GET'})
list(app(req.environ, self.start_response))
samples = self.pipeline_manager.pipelines[0].samples
self.assertEqual(0, len(samples))
@@ -263,7 +270,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
def test_publish_sample_fail(self, mocked_publish_sample):
mocked_publish_sample.side_effect = Exception("a exception")
app = swift_middleware.CeilometerMiddleware(FakeApp(body=["test"]), {})
req = webob.Request.blank('/1.0/account/container',
req = REQUEST.Request.blank('/1.0/account/container',
environ={'REQUEST_METHOD': 'GET'})
resp = list(app(req.environ, self.start_response))
samples = self.pipeline_manager.pipelines[0].samples
@@ -274,7 +281,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
def test_reseller_prefix(self):
# No reseller prefix set: ensure middleware uses AUTH_
app = swift_middleware.CeilometerMiddleware(FakeApp(), {})
req = webob.Request.blank('/1.0/AUTH_account/container/obj',
req = REQUEST.Request.blank('/1.0/AUTH_account/container/obj',
environ={'REQUEST_METHOD': 'GET'})
list(app(req.environ, self.start_response))
samples = self.pipeline_manager.pipelines[0].samples[0]
@@ -283,7 +290,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
# Custom reseller prefix set
app = swift_middleware.CeilometerMiddleware(
FakeApp(), {'reseller_prefix': 'CUSTOM_'})
req = webob.Request.blank('/1.0/CUSTOM_account/container/obj',
req = REQUEST.Request.blank('/1.0/CUSTOM_account/container/obj',
environ={'REQUEST_METHOD': 'GET'})
list(app(req.environ, self.start_response))
samples = self.pipeline_manager.pipelines[0].samples[0]
@@ -293,7 +300,7 @@ class TestSwiftMiddleware(test.BaseTestCase):
# Custom reseller prefix set, but without trailing underscore
app = swift_middleware.CeilometerMiddleware(
FakeApp(), {'reseller_prefix': 'CUSTOM'})
req = webob.Request.blank('/1.0/CUSTOM_account/container/obj',
req = REQUEST.Request.blank('/1.0/CUSTOM_account/container/obj',
environ={'REQUEST_METHOD': 'GET'})
list(app(req.environ, self.start_response))
samples = self.pipeline_manager.pipelines[0].samples[0]