networkd-test: fix resolved_domain_restricted_dns
authorMichael Biebl <biebl@debian.org>
Thu, 30 Sep 2021 23:00:28 +0000 (01:00 +0200)
committerMichael Biebl <biebl@debian.org>
Fri, 1 Oct 2021 08:12:14 +0000 (09:12 +0100)
megasearch.net was meant to be a non-existing bogus domain, and had been
for a long time. But it seems some domain grabber recently registered
it, and it's an actual thing now:

  $ host megasearch.net
  megasearch.net has address 207.148.248.143

This causes the test to fail randomly.

Use search.example.com instead which yields

  $ host search.example.com
  Host search.example.com not found: 3(NXDOMAIN)

Fixes: #18357
(cherry picked from commit 528dd6a42389fcf4aa490c0fa0d858772e930d13)

Gbp-Pq: Name networkd-test-fix-resolved_domain_restricted_dns.patch

test/networkd-test.py

index 8496ec881cee036e56dfe013c4542b3db3f2797d..8cdb6009b0628e515933f55e07d80c1569efbef5 100755 (executable)
@@ -656,8 +656,8 @@ Domains= ~company ~lab''')
         self.assertIn(b'kettle.cantina.company: 10.241.4.4', out)
 
         # test general domains
-        out = subprocess.check_output(['resolvectl', 'query', 'megasearch.net'])
-        self.assertIn(b'megasearch.net: 192.168.42.1', out)
+        out = subprocess.check_output(['resolvectl', 'query', 'search.example.com'])
+        self.assertIn(b'search.example.com: 192.168.42.1', out)
 
         with open(self.dnsmasq_log) as f:
             general_log = f.read()
@@ -671,8 +671,8 @@ Domains= ~company ~lab''')
         self.assertNotIn('.company', general_log)
 
         # general domains should not be sent to the VPN DNS
-        self.assertRegex(general_log, 'query.*megasearch.net')
-        self.assertNotIn('megasearch.net', vpn_log)
+        self.assertRegex(general_log, 'query.*search.example.com')
+        self.assertNotIn('search.example.com', vpn_log)
 
     def test_resolved_etc_hosts(self):
         '''resolved queries to /etc/hosts'''