From 0a4d2ee87721da4472099c1043c0146a9e02ee6d Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Mon, 17 Dec 2018 12:20:48 +0100 Subject: [PATCH] Fix mysql functional migration tests In patch [1] I marked all MySQL related migration tests as unstable but I made mistake with calling super() method in tests from TestModelsMigrationsMysql class. This wasn't catched as tests were skipped instead of fail. This patch fixes that, so tests can be run properly and be skipped only if "real" issue with timeout will happen. [1] https://review.openstack.org/#/c/624685/ Change-Id: Id42d6d8e24fdea5ac83f0fecc6975c19b933a501 Related-Bug: #1687027 --- neutron/tests/functional/db/test_migrations.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neutron/tests/functional/db/test_migrations.py b/neutron/tests/functional/db/test_migrations.py index 439b6299e77..c72bc14a4a6 100644 --- a/neutron/tests/functional/db/test_migrations.py +++ b/neutron/tests/functional/db/test_migrations.py @@ -373,29 +373,29 @@ class TestModelsMigrationsMysql(testlib_api.MySQLTestCaseMixin, @test_base.unstable_test("bug 1687027") def test_upgrade_expand_branch(self): - super(TestWalkMigrationsMysql, self).test_upgrade_expand_branch() + super(TestModelsMigrationsMysql, self).test_upgrade_expand_branch() @test_base.unstable_test("bug 1687027") def test_upgrade_contract_branch(self): - super(TestWalkMigrationsMysql, self).test_upgrade_contract_branch() + super(TestModelsMigrationsMysql, self).test_upgrade_contract_branch() @test_base.unstable_test("bug 1687027") def test_branches(self): - super(TestWalkMigrationsMysql, self).test_branches() + super(TestModelsMigrationsMysql, self).test_branches() @test_base.unstable_test("bug 1687027") def test_has_offline_migrations_pending_contract_scripts(self): - super(TestWalkMigrationsMysql, + super(TestModelsMigrationsMysql, self).test_has_offline_migrations_pending_contract_scripts() @test_base.unstable_test("bug 1687027") def test_has_offline_migrations_all_heads_upgraded(self): - super(TestWalkMigrationsMysql, + super(TestModelsMigrationsMysql, self).test_has_offline_migrations_all_heads_upgraded() @test_base.unstable_test("bug 1687027") def test_models_sync(self): - super(TestWalkMigrationsMysql, self).test_models_sync() + super(TestModelsMigrationsMysql, self).test_models_sync() class TestModelsMigrationsPsql(testlib_api.PostgreSQLTestCaseMixin,