From 619ac1c91aab0912aca325374c120b27fdef7579 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Fri, 24 Jul 2015 18:05:42 +0200 Subject: [PATCH] Python 3: fix test_context In Python 3, b'...'.startswith must be given bytes. Change-Id: I4e83685ac6119db6f16d693df37955620271082f Blueprint: neutron-python3 --- neutron/tests/unit/test_context.py | 2 +- tox.ini | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/neutron/tests/unit/test_context.py b/neutron/tests/unit/test_context.py index 1ecf338a22f..9dfc7f30662 100644 --- a/neutron/tests/unit/test_context.py +++ b/neutron/tests/unit/test_context.py @@ -34,7 +34,7 @@ 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('req-')) + self.assertThat(ctx.request_id, matchers.StartsWith(b'req-')) self.assertEqual('user_id', ctx.user) self.assertEqual('tenant_id', ctx.tenant) self.assertIsNone(ctx.user_name) diff --git a/tox.ini b/tox.ini index 37ddf17ccd0..f943932b2f0 100644 --- a/tox.ini +++ b/tox.ini @@ -103,6 +103,7 @@ commands = sphinx-build -W -b html doc/source doc/build/html [testenv:py34] commands = python -m testtools.run \ + neutron.tests.unit.test_context \ neutron.tests.unit.services.metering.drivers.test_iptables \ neutron.tests.unit.services.metering.agents.test_metering_agent \ neutron.tests.unit.services.l3_router.test_l3_apic \