Revert "Skip scenario tests if HA router will not be active"
This reverts commit 03c795e8c32d4fb65c79766000c459b1d2f16f31.
Reason for revert: Fix [1] should resolve that issue and tests
should be more stable now.
[1] https://review.opendev.org/c/openstack/neutron/+/796844
Depends-On: https://review.opendev.org/c/openstack/neutron/+/796844
Depends-On: https://review.opendev.org/c/openstack/neutron/+/797407
Depends-On: https://review.opendev.org/c/openstack/neutron/+/797408
Depends-On: https://review.opendev.org/c/openstack/neutron/+/797409
Depends-On: https://review.opendev.org/c/openstack/neutron/+/797410
Depends-On: https://review.opendev.org/c/openstack/neutron/+/797411
Depends-On: https://review.opendev.org/c/openstack/neutron/+/797412
Depends-On: https://review.opendev.org/c/openstack/neutron/+/797473
Change-Id: I2309f987c170b8fbaeaceef8b4db4fcb1c047fc7
Related-bug: #1923633
diff --git a/neutron_tempest_plugin/scenario/base.py b/neutron_tempest_plugin/scenario/base.py
index 784d031..c29585f 100644
--- a/neutron_tempest_plugin/scenario/base.py
+++ b/neutron_tempest_plugin/scenario/base.py
@@ -222,18 +222,12 @@
error_msg = (
"Router %s is not active on any of the L3 agents" % router_id)
- # NOTE(slaweq): Due to bug
- # the bug https://launchpad.net/bugs/1923633 let's temporary skip test
- # if router will not become active on any of the L3 agents in 600
- # seconds. When that bug will be fixed, we should get rid of that skip
- # and lower timeout to e.g. 300 seconds, or even less
- try:
- utils.wait_until_true(
- _router_active_on_l3_agent,
- timeout=600, sleep=5,
- exception=lib_exc.TimeoutException(error_msg))
- except lib_exc.TimeoutException:
- raise cls.skipException("Bug 1923633. %s" % error_msg)
+ # NOTE(slaweq): timeout here should be lower for sure, but due to
+ # the bug https://launchpad.net/bugs/1923633 let's wait even 10
+ # minutes until router will be active on some of the L3 agents
+ utils.wait_until_true(_router_active_on_l3_agent,
+ timeout=600, sleep=5,
+ exception=lib_exc.TimeoutException(error_msg))
@classmethod
def skip_if_no_extension_enabled_in_l3_agents(cls, extension):