Merge "Removing the decorator 'flaky'"

tobiko/tests/scenario/neutron/test_port.py

@@ -164,7 +164,6 @@ class ExtraDhcpOptsPortLoggingTest(testtools.TestCase):
 
     stack = tobiko.required_fixture(stacks.NetworkStackFixture)
 
-    @pytest.mark.flaky(reruns=2, reruns_delay=60)
     def test_extra_dhcp_opts_logs_unsupported_options(self):
         # initialize logs that match the pattern
         topology.assert_ovn_unsupported_dhcp_option_messages()

tobiko/tests/scenario/neutron/test_qos.py

@@ -17,7 +17,6 @@ from __future__ import absolute_import
 import time
 
 from oslo_log import log
-import pytest
 import testtools
 
 import tobiko
@@ -46,7 +45,11 @@ class QoSNetworkTest(testtools.TestCase):
     policy = tobiko.required_fixture(stacks.QosPolicyStackFixture)
     server = tobiko.required_fixture(stacks.QosServerStackFixture)
 
-    @pytest.mark.flaky(reruns=3, reruns_delay=120)
+    def setUp(self):
+        super(QoSNetworkTest, self).setUp()
+        # this is executed simply to wait until the server boot is completed
+        sh.get_hostname(self.server.ssh_client)
+
     def test_ping_dscp(self):
         capture_file = sh.execute('mktemp', sudo=True).stdout.strip()
         interface = ip.get_network_main_route_device(
@@ -85,7 +88,6 @@ class QoSNetworkTest(testtools.TestCase):
         """Verify server policy ID"""
         self.assertIsNone(self.server.port_details['qos_policy_id'])
 
-    @pytest.mark.flaky(reruns=3, reruns_delay=120)
     def test_qos_bw_limit(self):
         """Verify BW limit using the iperf3 tool"""
         self.server.wait_for_iperf3_server()

tobiko/tests/scenario/neutron/test_trunk.py

@@ -75,15 +75,11 @@ class RebootTrunkTest(testtools.TestCase):
             raise RuntimeError("Broken retry loop")
         self.assertEqual(set(expected), set(actual))
 
-    # Bug: https://bugzilla.redhat.com/show_bug.cgi?id=2030618
-    @pytest.mark.flaky(reruns=2, reruns_delay=60)
     def test_1_ping_vlan_port(self):
         """Check Nova server VLAN port is reachable"""
         self.stack.ensure_server_status('ACTIVE')
         self.stack.assert_vlan_is_reachable()
 
-    # Bug: https://bugzilla.redhat.com/show_bug.cgi?id=2030618
-    @pytest.mark.flaky(reruns=2, reruns_delay=60)
     @pytest.mark.ovn_migration
     def test_2_ping_vlan_port_after_restart(self):
         """Check Nova server VLAN port is reachable after hard restart"""