From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Mon, 26 Dec 2016 11:19:25 +0000 (+0100)
Subject: tests: more precise negative check for dnsmasq log (#4982)
X-Git-Tag: v233~283
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27e2e3231fc1edbbaa9f73be363900701ab4598d;p=thirdparty%2Fsystemd.git

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
---

diff --git a/test/networkd-test.py b/test/networkd-test.py
index f178a144f06..8599398c1c2 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')