From 5fbf1bec88fa9dfeb131d07a2854528db0df0253 Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Fri, 20 May 2022 08:53:34 -0700 Subject: [PATCH] [tests] use common definition for border router startup delay (#7721) --- .../thread-cert/border_router/test_advertising_proxy.py | 4 ++-- .../thread-cert/border_router/test_border_router_as_fed.py | 2 +- .../border_router/test_dnssd_instance_name_with_space.py | 4 ++-- .../scripts/thread-cert/border_router/test_dnssd_server.py | 2 +- .../border_router/test_dnssd_server_multi_border_routers.py | 4 ++-- .../border_router/test_end_device_udp_reachability.py | 2 +- .../thread-cert/border_router/test_external_route.py | 4 ++-- tests/scripts/thread-cert/border_router/test_firewall.py | 2 +- .../thread-cert/border_router/test_manual_address.py | 2 +- .../thread-cert/border_router/test_manual_maddress.py | 2 +- .../thread-cert/border_router/test_manual_omr_prefix.py | 6 ++++-- .../scripts/thread-cert/border_router/test_mdns_restart.py | 4 ++-- .../thread-cert/border_router/test_multi_border_routers.py | 4 ++-- .../thread-cert/border_router/test_multi_thread_networks.py | 4 ++-- .../border_router/test_nat64_multi_border_routers.py | 6 +++--- .../border_router/test_nat64_single_border_router.py | 4 ++-- .../thread-cert/border_router/test_plat_udp_accessiblity.py | 2 +- .../border_router/test_publish_meshcop_service.py | 6 +++--- .../scripts/thread-cert/border_router/test_radvd_coexist.py | 2 +- .../thread-cert/border_router/test_single_border_router.py | 4 ++-- .../thread-cert/border_router/test_trel_connectivity.py | 2 +- .../border_router/test_vicarious_router_solicit.py | 4 ++-- tests/scripts/thread-cert/config.py | 1 + 23 files changed, 40 insertions(+), 37 deletions(-) diff --git a/tests/scripts/thread-cert/border_router/test_advertising_proxy.py b/tests/scripts/thread-cert/border_router/test_advertising_proxy.py index 7516ec88f..0c088dce9 100755 --- a/tests/scripts/thread-cert/border_router/test_advertising_proxy.py +++ b/tests/scripts/thread-cert/border_router/test_advertising_proxy.py @@ -85,7 +85,7 @@ class SingleHostAndService(thread_cert.TestCase): server.srp_server_set_enabled(True) server.srp_server_set_lease_range(LEASE, LEASE, KEY_LEASE, KEY_LEASE) server.start() - self.simulator.go(10) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', server.get_state()) self.assertEqual(server.srp_server_get_state(), 'running') @@ -304,7 +304,7 @@ class SrpClientRemoveNonExistingHost(thread_cert.TestCase): server.srp_server_set_enabled(True) server.srp_server_set_lease_range(LEASE, LEASE, KEY_LEASE, KEY_LEASE) server.start() - self.simulator.go(10) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', server.get_state()) self.assertEqual(server.srp_server_get_state(), 'running') diff --git a/tests/scripts/thread-cert/border_router/test_border_router_as_fed.py b/tests/scripts/thread-cert/border_router/test_border_router_as_fed.py index a21ffa570..0a20239df 100644 --- a/tests/scripts/thread-cert/border_router/test_border_router_as_fed.py +++ b/tests/scripts/thread-cert/border_router/test_border_router_as_fed.py @@ -87,7 +87,7 @@ class TestBorderRouterAsFed(thread_cert.TestCase): self.simulator.go(5) self.assertEqual('child', br.get_state()) - self.simulator.go(20) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('child', br.get_state()) # Leader can ping to/from the Host on infra link. diff --git a/tests/scripts/thread-cert/border_router/test_dnssd_instance_name_with_space.py b/tests/scripts/thread-cert/border_router/test_dnssd_instance_name_with_space.py index f0eefa281..d20040dbd 100644 --- a/tests/scripts/thread-cert/border_router/test_dnssd_instance_name_with_space.py +++ b/tests/scripts/thread-cert/border_router/test_dnssd_instance_name_with_space.py @@ -90,12 +90,12 @@ class TestDnssdInstanceNameWithSpace(thread_cert.TestCase): self.simulator.go(5) br1.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) server.srp_server_set_enabled(True) br2.start() - self.simulator.go(config.ROUTER_STARTUP_DELAY) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('router', br2.get_state()) client.start() diff --git a/tests/scripts/thread-cert/border_router/test_dnssd_server.py b/tests/scripts/thread-cert/border_router/test_dnssd_server.py index be3b8bebd..9d07d28a8 100644 --- a/tests/scripts/thread-cert/border_router/test_dnssd_server.py +++ b/tests/scripts/thread-cert/border_router/test_dnssd_server.py @@ -94,7 +94,7 @@ class TestDnssdServerOnBr(thread_cert.TestCase): self.simulator.go(5) br1.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) server.srp_server_set_enabled(True) diff --git a/tests/scripts/thread-cert/border_router/test_dnssd_server_multi_border_routers.py b/tests/scripts/thread-cert/border_router/test_dnssd_server_multi_border_routers.py index b78398080..0f267e0aa 100644 --- a/tests/scripts/thread-cert/border_router/test_dnssd_server_multi_border_routers.py +++ b/tests/scripts/thread-cert/border_router/test_dnssd_server_multi_border_routers.py @@ -111,7 +111,7 @@ class TestDnssdServerOnMultiBr(thread_cert.TestCase): self.simulator.go(5) br1.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) br1.srp_server_set_enabled(True) @@ -140,7 +140,7 @@ class TestDnssdServerOnMultiBr(thread_cert.TestCase): br2.start_otbr_service() br2.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) br2_addr = br2.get_ip6_address(config.ADDRESS_TYPE.OMR)[0] diff --git a/tests/scripts/thread-cert/border_router/test_end_device_udp_reachability.py b/tests/scripts/thread-cert/border_router/test_end_device_udp_reachability.py index 96455c70c..bef4a6a1b 100644 --- a/tests/scripts/thread-cert/border_router/test_end_device_udp_reachability.py +++ b/tests/scripts/thread-cert/border_router/test_end_device_udp_reachability.py @@ -82,7 +82,7 @@ class TestEndDeviceUdpReachability(thread_cert.TestCase): self.simulator.go(5) br1.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) br1.udp_start("::", PORT, bind_unspecified=True) diff --git a/tests/scripts/thread-cert/border_router/test_external_route.py b/tests/scripts/thread-cert/border_router/test_external_route.py index 7ed71dcb9..236a8286b 100644 --- a/tests/scripts/thread-cert/border_router/test_external_route.py +++ b/tests/scripts/thread-cert/border_router/test_external_route.py @@ -93,11 +93,11 @@ class ExternalRoutes(thread_cert.TestCase): host = self.nodes[HOST] br1.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) br2.start() - self.simulator.go(config.ROUTER_STARTUP_DELAY) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('router', br2.get_state()) router1.start() diff --git a/tests/scripts/thread-cert/border_router/test_firewall.py b/tests/scripts/thread-cert/border_router/test_firewall.py index 84b00500f..abc6d3614 100644 --- a/tests/scripts/thread-cert/border_router/test_firewall.py +++ b/tests/scripts/thread-cert/border_router/test_firewall.py @@ -81,7 +81,7 @@ class Firewall(thread_cert.TestCase): host = self.nodes[HOST] br1.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) router1.start() diff --git a/tests/scripts/thread-cert/border_router/test_manual_address.py b/tests/scripts/thread-cert/border_router/test_manual_address.py index 62edbaa33..aeb6c6051 100644 --- a/tests/scripts/thread-cert/border_router/test_manual_address.py +++ b/tests/scripts/thread-cert/border_router/test_manual_address.py @@ -71,7 +71,7 @@ class ManualAddressConfig(thread_cert.TestCase): router = self.nodes[ROUTER] br1.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) self.assertTrue(br1.is_primary_backbone_router) diff --git a/tests/scripts/thread-cert/border_router/test_manual_maddress.py b/tests/scripts/thread-cert/border_router/test_manual_maddress.py index b39a4189f..93f94b55b 100644 --- a/tests/scripts/thread-cert/border_router/test_manual_maddress.py +++ b/tests/scripts/thread-cert/border_router/test_manual_maddress.py @@ -76,7 +76,7 @@ class ManualMulticastAddressConfig(thread_cert.TestCase): host = self.nodes[HOST] br1.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) self.assertTrue(br1.is_primary_backbone_router) diff --git a/tests/scripts/thread-cert/border_router/test_manual_omr_prefix.py b/tests/scripts/thread-cert/border_router/test_manual_omr_prefix.py index 66f4cf2dd..e9035c69d 100644 --- a/tests/scripts/thread-cert/border_router/test_manual_omr_prefix.py +++ b/tests/scripts/thread-cert/border_router/test_manual_omr_prefix.py @@ -28,6 +28,8 @@ # import ipaddress import unittest + +import config import thread_cert # Test description: @@ -65,7 +67,7 @@ class ManualOmrsPrefix(thread_cert.TestCase): br2 = self.nodes[BR_2] br1.start() - self.simulator.go(10) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) self.simulator.go(10) @@ -73,7 +75,7 @@ class ManualOmrsPrefix(thread_cert.TestCase): br2.disable_br() br2.start() - self.simulator.go(15) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('router', br2.get_state()) self.assertEqual(br1.get_netdata_omr_prefixes(), [br1.get_br_omr_prefix()]) diff --git a/tests/scripts/thread-cert/border_router/test_mdns_restart.py b/tests/scripts/thread-cert/border_router/test_mdns_restart.py index 2ea86d02a..585e9da07 100755 --- a/tests/scripts/thread-cert/border_router/test_mdns_restart.py +++ b/tests/scripts/thread-cert/border_router/test_mdns_restart.py @@ -100,13 +100,13 @@ class MdnsRestart(thread_cert.TestCase): self.simulator.go(5) br1.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) self.simulator.go(5) br2.start() - self.simulator.go(config.ROUTER_STARTUP_DELAY) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('router', br2.get_state()) ed1.start() diff --git a/tests/scripts/thread-cert/border_router/test_multi_border_routers.py b/tests/scripts/thread-cert/border_router/test_multi_border_routers.py index 5e4eeabd7..894882a06 100755 --- a/tests/scripts/thread-cert/border_router/test_multi_border_routers.py +++ b/tests/scripts/thread-cert/border_router/test_multi_border_routers.py @@ -102,7 +102,7 @@ class MultiBorderRouters(thread_cert.TestCase): self.simulator.go(5) br1.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) router1.start() @@ -112,7 +112,7 @@ class MultiBorderRouters(thread_cert.TestCase): self.simulator.go(5) br2.start() - self.simulator.go(config.ROUTER_STARTUP_DELAY) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('router', br2.get_state()) router2.start() diff --git a/tests/scripts/thread-cert/border_router/test_multi_thread_networks.py b/tests/scripts/thread-cert/border_router/test_multi_thread_networks.py index c5ab786ac..9ad442d4f 100755 --- a/tests/scripts/thread-cert/border_router/test_multi_thread_networks.py +++ b/tests/scripts/thread-cert/border_router/test_multi_thread_networks.py @@ -93,7 +93,7 @@ class MultiThreadNetworks(thread_cert.TestCase): router2 = self.nodes[ROUTER2] br1.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) router1.start() @@ -101,7 +101,7 @@ class MultiThreadNetworks(thread_cert.TestCase): self.assertEqual('router', router1.get_state()) br2.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br2.get_state()) router2.start() diff --git a/tests/scripts/thread-cert/border_router/test_nat64_multi_border_routers.py b/tests/scripts/thread-cert/border_router/test_nat64_multi_border_routers.py index c09383604..569699721 100644 --- a/tests/scripts/thread-cert/border_router/test_nat64_multi_border_routers.py +++ b/tests/scripts/thread-cert/border_router/test_nat64_multi_border_routers.py @@ -89,7 +89,7 @@ class Nat64MultiBorderRouter(thread_cert.TestCase): self.simulator.go(5) br1.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) router.start() @@ -101,7 +101,7 @@ class Nat64MultiBorderRouter(thread_cert.TestCase): # its local nat64 prefix to Network Data. # br2.start() - self.simulator.go(config.ROUTER_STARTUP_DELAY) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('router', br2.get_state()) # Only 1 NAT64 prefix in Network Data. @@ -129,7 +129,7 @@ class Nat64MultiBorderRouter(thread_cert.TestCase): self.assertNotEqual(br1_nat64_prefix, br1.get_netdata_nat64_prefix()[0]) br1.enable_br() - self.simulator.go(30) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) # NAT64 prefix in Network Data is still advertised by BR2. self.assertEqual(len(br1.get_netdata_nat64_prefix()), 1) diff --git a/tests/scripts/thread-cert/border_router/test_nat64_single_border_router.py b/tests/scripts/thread-cert/border_router/test_nat64_single_border_router.py index bcd4a9560..4ac418924 100644 --- a/tests/scripts/thread-cert/border_router/test_nat64_single_border_router.py +++ b/tests/scripts/thread-cert/border_router/test_nat64_single_border_router.py @@ -84,7 +84,7 @@ class Nat64SingleBorderRouter(thread_cert.TestCase): self.simulator.go(5) br.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br.get_state()) router.start() @@ -130,7 +130,7 @@ class Nat64SingleBorderRouter(thread_cert.TestCase): self.assertEqual(len(br.get_netdata_nat64_prefix()), 0) br.enable_br() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) # Same NAT64 prefix is advertised to Network Data. self.assertEqual(len(br.get_netdata_nat64_prefix()), 1) diff --git a/tests/scripts/thread-cert/border_router/test_plat_udp_accessiblity.py b/tests/scripts/thread-cert/border_router/test_plat_udp_accessiblity.py index f97c1e652..12f83e50c 100644 --- a/tests/scripts/thread-cert/border_router/test_plat_udp_accessiblity.py +++ b/tests/scripts/thread-cert/border_router/test_plat_udp_accessiblity.py @@ -67,7 +67,7 @@ class TestPlatUdpAccessibility(thread_cert.TestCase): router = self.nodes[ROUTER] br.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br.get_state()) br.srp_server_set_enabled(True) diff --git a/tests/scripts/thread-cert/border_router/test_publish_meshcop_service.py b/tests/scripts/thread-cert/border_router/test_publish_meshcop_service.py index 17a201bd9..93f049736 100755 --- a/tests/scripts/thread-cert/border_router/test_publish_meshcop_service.py +++ b/tests/scripts/thread-cert/border_router/test_publish_meshcop_service.py @@ -92,7 +92,7 @@ class PublishMeshCopService(thread_cert.TestCase): # TODO enable this line when renaming with mDNSResponder is stable # self.check_meshcop_service(br1, host) br1.start() - self.simulator.go(20) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) self.check_meshcop_service(br1, host) @@ -103,7 +103,7 @@ class PublishMeshCopService(thread_cert.TestCase): br1.stop() br1.set_network_name('ot-br1-1') br1.start() - self.simulator.go(10) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.check_meshcop_service(br1, host) # verify that there are two meshcop services @@ -111,7 +111,7 @@ class PublishMeshCopService(thread_cert.TestCase): br2.start() br2.disable_backbone_router() br2.enable_br() - self.simulator.go(25) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) service_instances = host.browse_mdns_services('_meshcop._udp') self.assertEqual(len(service_instances), 2) diff --git a/tests/scripts/thread-cert/border_router/test_radvd_coexist.py b/tests/scripts/thread-cert/border_router/test_radvd_coexist.py index 106afefff..9492e7d72 100755 --- a/tests/scripts/thread-cert/border_router/test_radvd_coexist.py +++ b/tests/scripts/thread-cert/border_router/test_radvd_coexist.py @@ -93,7 +93,7 @@ class SingleBorderRouter(thread_cert.TestCase): self.simulator.go(config.ROUTER_STARTUP_DELAY) self.assertEqual('router', router.get_state()) - self.simulator.go(10) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.collect_ipaddrs() logging.info("BR addrs: %r", br.get_addrs()) diff --git a/tests/scripts/thread-cert/border_router/test_single_border_router.py b/tests/scripts/thread-cert/border_router/test_single_border_router.py index 4776fefbe..8f03644be 100755 --- a/tests/scripts/thread-cert/border_router/test_single_border_router.py +++ b/tests/scripts/thread-cert/border_router/test_single_border_router.py @@ -85,7 +85,7 @@ class SingleBorderRouter(thread_cert.TestCase): self.simulator.go(5) br.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br.get_state()) router.start() @@ -216,7 +216,7 @@ class SingleBorderRouter(thread_cert.TestCase): br.enable_br() # It takes around 10 seconds to start sending RA messages. - self.simulator.go(15) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.collect_ipaddrs() logging.info("BR addrs: %r", br.get_addrs()) diff --git a/tests/scripts/thread-cert/border_router/test_trel_connectivity.py b/tests/scripts/thread-cert/border_router/test_trel_connectivity.py index ceba885ce..718113819 100644 --- a/tests/scripts/thread-cert/border_router/test_trel_connectivity.py +++ b/tests/scripts/thread-cert/border_router/test_trel_connectivity.py @@ -126,7 +126,7 @@ class TestTrelConnectivity(thread_cert.TestCase): self.wait_node_state(router2, 'router', 10) # Allow the network to stabilize - self.simulator.go(config.ROUTER_STARTUP_DELAY) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.collect_ipaddrs() self.collect_rloc16s() diff --git a/tests/scripts/thread-cert/border_router/test_vicarious_router_solicit.py b/tests/scripts/thread-cert/border_router/test_vicarious_router_solicit.py index 5c1e55847..065cdae1b 100755 --- a/tests/scripts/thread-cert/border_router/test_vicarious_router_solicit.py +++ b/tests/scripts/thread-cert/border_router/test_vicarious_router_solicit.py @@ -112,7 +112,7 @@ class MultiThreadNetworks(thread_cert.TestCase): self.simulator.go(5) br1.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br1.get_state()) router1.start() @@ -139,7 +139,7 @@ class MultiThreadNetworks(thread_cert.TestCase): host.kill_radvd_service() br2.start() - self.simulator.go(5) + self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('leader', br2.get_state()) router2.start() diff --git a/tests/scripts/thread-cert/config.py b/tests/scripts/thread-cert/config.py index 9ba199ee4..7f10f27a6 100755 --- a/tests/scripts/thread-cert/config.py +++ b/tests/scripts/thread-cert/config.py @@ -126,6 +126,7 @@ SNIFFER_ID = int(os.getenv('SNIFFER_ID', 34)) PANID = 0xface ROUTER_STARTUP_DELAY = 10 +BORDER_ROUTER_STARTUP_DELAY = 20 MAX_NEIGHBOR_AGE = 100 INFINITE_COST_TIMEOUT = 90