diff options
| author | Brian Elliott <brian.elliott@rackspace.com> | 2012-05-03 23:29:59 +0000 |
|---|---|---|
| committer | Brian Elliott <brian.elliott@rackspace.com> | 2012-05-03 23:29:59 +0000 |
| commit | 4b0f4b84e5a26526d8cd28c7ccc078c11ba5abb7 (patch) | |
| tree | 11c054c33fcf9eaac5075b47b6c0abbe15427a5f | |
| parent | 7137d1eddaa1bb5049f49bcdef5dcb62905f1dfa (diff) | |
Fix test_mysql_innodb
If the default table engine in MySQL wasn't set to be InnoDB,
then the sqlalchemy migration version table would cause
'test_mysql_innodb' to fail.
Change-Id: I38787d4c3e3f2896fdc349d6f7817d3ef78cc2a5
| -rw-r--r-- | nova/tests/test_migrations.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py index cdc90a46e..6987c2a29 100644 --- a/nova/tests/test_migrations.py +++ b/nova/tests/test_migrations.py @@ -243,7 +243,8 @@ class TestMigrations(test.TestCase): noninnodb = connection.execute("SELECT count(*) " "from information_schema.TABLES " "where TABLE_SCHEMA='openstack_citest' " - "and ENGINE!='InnoDB'") + "and ENGINE!='InnoDB' " + "and TABLE_NAME!='migrate_version'") count = noninnodb.scalar() self.assertEqual(count, 0, "%d non InnoDB tables created" % count) |