Merge "Enable test_swift_middleware on Python 3"

This commit is contained in:
Jenkins 2015-05-27 15:31:02 +00:00 committed by Gerrit Code Review
commit c4cc3bdab4
2 changed files with 5 additions and 4 deletions

View File

@ -239,13 +239,13 @@ class TestSwiftMiddleware(tests_base.BaseTestCase):
self.assertEqual('1.0', data.resource_metadata['version'])
self.assertEqual('container', data.resource_metadata['container'])
self.assertIsNone(data.resource_metadata['object'])
self.assertEqual('value1',
self.assertEqual(b'value1',
data.resource_metadata['http_header_x_var1'])
self.assertEqual('value2',
self.assertEqual(b'value2',
data.resource_metadata['http_header_x_var2'])
self.assertEqual('token',
self.assertEqual(b'token',
data.resource_metadata['http_header_token'])
self.assertFalse('http_header_x_var3' in data.resource_metadata)
self.assertFalse(b'http_header_x_var3' in data.resource_metadata)
def test_metadata_headers_unicode(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(), {

View File

@ -56,6 +56,7 @@ commands = python -m testtools.run \
ceilometer.tests.network.services.test_vpnaas \
ceilometer.tests.network.test_floatingip \
ceilometer.tests.network.test_notifications \
ceilometer.tests.objectstore.test_swift_middleware \
ceilometer.tests.orchestration.test_notifications \
ceilometer.tests.profiler.test_notifications \
ceilometer.tests.publisher.test_direct \