Support Unicode request_id on Python 3

The oslo.context change If48ee7f4d1c113f1f26b3b1698c6b055807b950f will change
request_id type on Python 3 from bytes to str. This change prepares Neutron for
this change.

Blueprint: neutron-python3
Change-Id: Ia5203581db120bb4f8e24fd752d6ae14e6558505

diff --git a/neutron/tests/unit/test_context.py b/neutron/tests/unit/test_context.py
index 9dfc7f306626a429712663f5eb75f256895dea24..362f13e84e9916a165f5d8e7866273e19ec20a83 100644 (file)
--- a/neutron/tests/unit/test_context.py
+++ b/neutron/tests/unit/test_context.py
@@ -34,7 +34,10 @@ class TestNeutronContext(base.BaseTestCase):
         self.assertEqual('user_id', ctx.user_id)
         self.assertEqual('tenant_id', ctx.project_id)
         self.assertEqual('tenant_id', ctx.tenant_id)
-        self.assertThat(ctx.request_id, matchers.StartsWith(b'req-'))
+        request_id = ctx.request_id
+        if isinstance(request_id, bytes):
+            request_id = request_id.decode('utf-8')
+        self.assertThat(request_id, matchers.StartsWith('req-'))
         self.assertEqual('user_id', ctx.user)
         self.assertEqual('tenant_id', ctx.tenant)
         self.assertIsNone(ctx.user_name)