]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
tests/dns_update: Add error message for diagnosis
authorGarming Sam <garming@catalyst.net.nz>
Mon, 11 Jul 2016 05:20:40 +0000 (17:20 +1200)
committerGarming Sam <garming@samba.org>
Mon, 11 Jul 2016 08:58:15 +0000 (10:58 +0200)
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Garming Sam <garming@samba.org>
Autobuild-Date(master): Mon Jul 11 10:58:16 CEST 2016 on sn-devel-144

python/samba/tests/blackbox/samba_dnsupdate.py

index 852a31afde4169c8283a8b00713e780ff601384e..8cf367f6c35b19c1ecf884cea1a47e1ab67a9495 100644 (file)
@@ -26,19 +26,19 @@ class SambaDnsUpdateTests(samba.tests.BlackboxTestCase):
         super(SambaDnsUpdateTests, self).setUp()
         try:
             out = self.check_output("samba_dnsupdate --verbose")
-            self.assertTrue("Looking for DNS entry" in out)
+            self.assertTrue("Looking for DNS entry" in out, out)
         except samba.tests.BlackboxProcessError:
             pass
 
     def test_samba_dnsupate_no_change(self):
         out = self.check_output("samba_dnsupdate --verbose")
-        self.assertTrue("No DNS updates needed" in out)
+        self.assertTrue("No DNS updates needed" in out, out)
 
     def test_samba_dnsupate_set_ip(self):
         try:
             out = self.check_output("samba_dnsupdate --verbose --current-ip=10.0.0.1")
-            self.assertTrue(" DNS updates and" in out)
-            self.assertTrue(" DNS deletes needed" in out)
+            self.assertTrue(" DNS updates and" in out, out)
+            self.assertTrue(" DNS deletes needed" in out, out)
         except samba.tests.BlackboxProcessError:
             pass
 
@@ -47,13 +47,13 @@ class SambaDnsUpdateTests(samba.tests.BlackboxTestCase):
         except samba.tests.BlackboxProcessError:
             self.fail("Error calling samba_dnsupdate")
 
-        self.assertTrue("No DNS updates needed" in out)
+        self.assertTrue("No DNS updates needed" in out, out)
         try:
             out = self.check_output("samba_dnsupdate --verbose --use-samba-tool --rpc-server-ip=%s" % self.server_ip)
         except samba.tests.BlackboxProcessError:
             self.fail("Error calling samba_dnsupdate")
 
-        self.assertTrue(" DNS updates and" in out)
-        self.assertTrue(" DNS deletes needed" in out)
+        self.assertTrue(" DNS updates and" in out, out)
+        self.assertTrue(" DNS deletes needed" in out, out)
         out = self.check_output("samba_dnsupdate --verbose")
-        self.assertTrue("No DNS updates needed" in out)
+        self.assertTrue("No DNS updates needed" in out, out)