From 345a7eb196ab0b9fcfd55c2c5b6f573d9b4e2caa Mon Sep 17 00:00:00 2001 From: Peter Stachowski Date: Wed, 21 Sep 2016 15:04:28 +0000 Subject: [PATCH] Skip 'eject valid master' replication test This test was skipped in the scenario runs however it was not disabled in the original api tests. Although it doesn't fail as often there it still happens, so the same change has been applied to it. See: https://review.openstack.org/#/c/368230 The test will also print out the bug number during each run as a reminder (using the new SkipKnownBug method). Change-Id: I931d6d72a70cc93dcd8248d9840eadf1160b9bab Related-Bug: #1622014 (cherry picked from commit e89dfbd51d4cad01a2ad701e9300ccfe6e7eac5a) --- trove/tests/api/replication.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/trove/tests/api/replication.py b/trove/tests/api/replication.py index 44f3de3dc4..6596ba6180 100644 --- a/trove/tests/api/replication.py +++ b/trove/tests/api/replication.py @@ -30,6 +30,8 @@ from trove.tests.api.instances import TIMEOUT_INSTANCE_CREATE from trove.tests.api.instances import TIMEOUT_INSTANCE_DELETE from trove.tests.api.instances import WaitForGuestInstallationToFinish from trove.tests.config import CONFIG +from trove.tests.scenario import runners +from trove.tests.scenario.runners.test_runners import SkipKnownBug from trove.tests.util.server_connection import create_server_connection @@ -267,9 +269,11 @@ class TestReplicationFailover(object): if CONFIG.fake_mode: raise SkipTest("eject_replica_source not supported in fake mode") - assert_raises(exceptions.BadRequest, - instance_info.dbaas.instances.eject_replica_source, - instance_info.id) + # assert_raises(exceptions.BadRequest, + # instance_info.dbaas.instances.eject_replica_source, + # instance_info.id) + # Uncomment once BUG_EJECT_VALID_MASTER is fixed + raise SkipKnownBug(runners.BUG_EJECT_VALID_MASTER) @test(depends_on=[test_promote_master, test_eject_slave, test_eject_valid_master])