From ab2a1bc7adfbf26a718be815872d5c00fe92e1f8 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 25 May 2015 15:42:46 +0200 Subject: [PATCH] Enable test_swift_middleware on Python 3 Enable also event_pipeline test. Change-Id: Iffdbc770bb167f49243d7799bb50dc7c4c65a0dd --- ceilometer/tests/objectstore/test_swift_middleware.py | 8 ++++---- tox.ini | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ceilometer/tests/objectstore/test_swift_middleware.py b/ceilometer/tests/objectstore/test_swift_middleware.py index 2d41f8607..bfda2050c 100644 --- a/ceilometer/tests/objectstore/test_swift_middleware.py +++ b/ceilometer/tests/objectstore/test_swift_middleware.py @@ -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(), { diff --git a/tox.ini b/tox.ini index 75a13d5f3..0cbc1276e 100644 --- a/tox.ini +++ b/tox.ini @@ -38,6 +38,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 \