From 3e6542a6e343d995ea480f4711ecc745d1c99971 Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Mon, 4 Jun 2018 16:34:29 -0400 Subject: [PATCH] Convert to string before using assertIn Convert actual output to a string before checking it so that we avoid a mismatch error. Change-Id: Id106583c113a9d8c7d0aa6bc6e6468ad75e77b0d Closes-bug: #1775071 --- glance/tests/functional/test_glance_manage.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/glance/tests/functional/test_glance_manage.py b/glance/tests/functional/test_glance_manage.py index 8fb012990f..b09320bf77 100644 --- a/glance/tests/functional/test_glance_manage.py +++ b/glance/tests/functional/test_glance_manage.py @@ -134,7 +134,7 @@ class TestGlanceManage(functional.FunctionalTest): self.assertEqual(expand_head, out.rstrip().decode("utf-8")) exitcode, out, err = self._db_command(db_method='expand') self.assertIn('Database expansion is up to date. ' - 'No expansion needed.', out) + 'No expansion needed.', str(out)) @depends_on_exe('sqlite3') @skip_if_disabled @@ -155,7 +155,7 @@ class TestGlanceManage(functional.FunctionalTest): if data_migrations.has_pending_migrations(db_api.get_engine()): exitcode, out, err = self._db_command(db_method='migrate') self.assertIn('Database migration is up to date. No migration ' - 'needed.', out) + 'needed.', str(out)) @depends_on_exe('sqlite3') @skip_if_disabled @@ -173,4 +173,5 @@ class TestGlanceManage(functional.FunctionalTest): exitcode, out, err = execute(cmd, raise_error=True) self.assertEqual(contract_head, out.rstrip().decode("utf-8")) exitcode, out, err = self._db_command(db_method='contract') - self.assertIn('Database is up to date. No migrations needed.', out) + self.assertIn('Database is up to date. No migrations needed.', + str(out))