From 4be7e8baa2accca3613611457da42d38e93909d4 Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Wed, 23 Apr 2025 10:05:30 -0700 Subject: [PATCH] [tests] allow `service bind9 stop` to fail (#11438) --- .../border_router/internet/test_multi_border_routers.py | 4 ++-- .../border_router/internet/test_single_border_router.py | 2 +- .../thread-cert/border_router/internet/test_upstream_dns.py | 4 ++-- .../border_router/internet/test_with_infrastructure_prefix.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/scripts/thread-cert/border_router/internet/test_multi_border_routers.py b/tests/scripts/thread-cert/border_router/internet/test_multi_border_routers.py index 32ef64ab3..2e38ba55f 100755 --- a/tests/scripts/thread-cert/border_router/internet/test_multi_border_routers.py +++ b/tests/scripts/thread-cert/border_router/internet/test_multi_border_routers.py @@ -100,7 +100,7 @@ class Nat64MultiBorderRouter(thread_cert.TestCase): # ensure NAT64 is enabled here. br1.nat64_set_enabled(True) self.simulator.go(config.LEADER_STARTUP_DELAY) - br1.bash("service bind9 stop") + br1.bash("service bind9 stop || true") self.simulator.go(NAT64_PREFIX_REFRESH_DELAY) self.assertEqual('leader', br1.get_state()) @@ -167,7 +167,7 @@ class Nat64MultiBorderRouter(thread_cert.TestCase): # Case 3. Re-enables BR2 with a local prefix and it will not add # its local nat64 prefix to Network Data. # - br2.bash("service bind9 stop") + br2.bash("service bind9 stop || true") self.simulator.go(5) br2.nat64_set_enabled(True) diff --git a/tests/scripts/thread-cert/border_router/internet/test_single_border_router.py b/tests/scripts/thread-cert/border_router/internet/test_single_border_router.py index 33d010e5e..fe334fe14 100755 --- a/tests/scripts/thread-cert/border_router/internet/test_single_border_router.py +++ b/tests/scripts/thread-cert/border_router/internet/test_single_border_router.py @@ -123,7 +123,7 @@ class Nat64SingleBorderRouter(thread_cert.TestCase): # ensure NAT64 is enabled here. br.nat64_set_enabled(True) self.simulator.go(config.LEADER_STARTUP_DELAY) - br.bash("service bind9 stop") + br.bash("service bind9 stop || true") self.simulator.go(330) self.assertEqual('leader', br.get_state()) diff --git a/tests/scripts/thread-cert/border_router/internet/test_upstream_dns.py b/tests/scripts/thread-cert/border_router/internet/test_upstream_dns.py index c93f35cb9..e53ae8550 100755 --- a/tests/scripts/thread-cert/border_router/internet/test_upstream_dns.py +++ b/tests/scripts/thread-cert/border_router/internet/test_upstream_dns.py @@ -91,7 +91,7 @@ class UpstreamDns(thread_cert.TestCase): self._start_dns_server(dns_server_2, TEST_DOMAIN_2, TEST_DOMAIN_IP6_ADDRESSES_2) # Disable the bind9 service on the BR otherwise bind9 may respond to Thread devices' DNS queries - br.bash('service bind9 stop') + br.bash('service bind9 stop || true') br.start() self.simulator.go(config.LEADER_STARTUP_DELAY) @@ -144,7 +144,7 @@ $TTL 24h ''' + '\n'.join(f'@ IN AAAA {addr}' for addr in test_domain_ip6_addresses) dns_server.start(start_radvd=False) - dns_server.bash('service bind9 stop') + dns_server.bash('service bind9 stop || true') dns_server.bash(shlex.join(['echo', test_domain_bind_conf]) + ' >> /etc/bind/named.conf.local') dns_server.bash(shlex.join(['echo', test_domain_bind_zone]) + ' >> /etc/bind/db.test.domain') diff --git a/tests/scripts/thread-cert/border_router/internet/test_with_infrastructure_prefix.py b/tests/scripts/thread-cert/border_router/internet/test_with_infrastructure_prefix.py index 21ab2ba54..d05b4c374 100755 --- a/tests/scripts/thread-cert/border_router/internet/test_with_infrastructure_prefix.py +++ b/tests/scripts/thread-cert/border_router/internet/test_with_infrastructure_prefix.py @@ -157,7 +157,7 @@ class Nat64SingleBorderRouter(thread_cert.TestCase): self.simulator.go(5) # Case 5 Infrastructure nat64 prefix no longer presents - br.bash("service bind9 stop") + br.bash("service bind9 stop || true") self.simulator.go(NAT64_PREFIX_REFRESH_DELAY) local_nat64_prefix = br.get_br_nat64_prefix()