Skip to content
Browse files

Fix semantics for migration test environment var

Change-Id: I483f29d826fe1e1d1478e714524661aaf20c1cf3
  • Loading branch information...
1 parent 6dc6277 commit 4e20178783c2d014b027e509fc26295eb5bc0768 Mark Washenberger committed May 4, 2012
Showing with 6 additions and 5 deletions.
  1. +6 −5 nova/tests/test_migrations.py
View
11 nova/tests/test_migrations.py
@@ -68,10 +68,11 @@ def _is_mysql_avail(user="openstack_citest",
return True
-def _missing_mysql():
- if "NOVA_TEST_MYSQL_PRESENT" in os.environ:
- return True
- return not _is_mysql_avail()
+def _have_mysql():
+ present = os.environ.get('NOVA_TEST_MYSQL_PRESENT')
+ if present is None:
+ return _is_mysql_avail()
+ return present.lower() in ('', 'true')
class TestMigrations(test.TestCase):
@@ -215,7 +216,7 @@ def test_mysql_connect_fail(self):
if _is_mysql_avail(user="openstack_cifail"):
self.fail("Shouldn't have connected")
- @test.skip_if(_missing_mysql(), "mysql not available")
+ @test.skip_unless(_have_mysql(), "mysql not available")
def test_mysql_innodb(self):
"""
Test that table creation on mysql only builds InnoDB tables

0 comments on commit 4e20178

Please sign in to comment.
Something went wrong with that request. Please try again.