summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-12-26 12:19:25 +0100
committerLennart Poettering <lennart@poettering.net>2016-12-26 12:19:25 +0100
commit27e2e3231fc1edbbaa9f73be363900701ab4598d (patch)
treeb55f041c0cccea948713d861a0858768884d03ca
parent08493e73bfc397fd7c7e24d97e4f56434eaac874 (diff)
tests: more precise negative check for dnsmasq log (#4982)
In test_resolved_domain_restricted_dns(), add dot domain separator to negative .lab/.company tests, so that we don't catch these as part of the host name (like "lxc-labjfr"). Caught in PR #4962
-rwxr-xr-xtest/networkd-test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/networkd-test.py b/test/networkd-test.py
index f178a144f0..8599398c1c 100755
--- a/test/networkd-test.py
+++ b/test/networkd-test.py
@@ -497,8 +497,8 @@ Domains= ~company ~lab''')
# VPN domains should only be sent to VPN DNS
self.assertRegex(vpn_log, 'query.*math.lab')
self.assertRegex(vpn_log, 'query.*cantina.company')
- self.assertNotIn('lab', general_log)
- self.assertNotIn('company', general_log)
+ self.assertNotIn('.lab', general_log)
+ self.assertNotIn('.company', general_log)
# general domains should not be sent to the VPN DNS
self.assertRegex(general_log, 'query.*megasearch.net')