Merge "Unmark test_router_is_scheduled_on_l3_agents as flaky"
This commit is contained in:
commit
0415455255
@ -14,7 +14,6 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
import pytest
|
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
@ -122,7 +121,6 @@ class L3HARouterTest(RouterTest):
|
|||||||
#: Resources stack with Nova server to send messages to
|
#: Resources stack with Nova server to send messages to
|
||||||
stack = tobiko.required_setup_fixture(stacks.L3haServerStackFixture)
|
stack = tobiko.required_setup_fixture(stacks.L3haServerStackFixture)
|
||||||
|
|
||||||
@pytest.mark.flaky(reruns=5, reruns_delay=120)
|
|
||||||
@neutron.skip_if_missing_networking_extensions('l3_agent_scheduler')
|
@neutron.skip_if_missing_networking_extensions('l3_agent_scheduler')
|
||||||
def test_router_is_scheduled_on_l3_agents(self):
|
def test_router_is_scheduled_on_l3_agents(self):
|
||||||
master_agent, backup_agents = (
|
master_agent, backup_agents = (
|
||||||
|
Loading…
Reference in New Issue
Block a user