From: Garming Sam <garming@catalyst.net.nz>
Date: Mon, 11 Jul 2016 05:20:40 +0000 (+1200)
Subject: tests/dns_update: Add error message for diagnosis
X-Git-Tag: tdb-1.3.10~433
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c4c3e0fcf88753374fdb279b4519989501ede2f;p=thirdparty%2Fsamba.git

tests/dns_update: Add error message for diagnosis

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

diff --git a/python/samba/tests/blackbox/samba_dnsupdate.py b/python/samba/tests/blackbox/samba_dnsupdate.py
index 852a31afde4..8cf367f6c35 100644
--- a/python/samba/tests/blackbox/samba_dnsupdate.py
+++ b/python/samba/tests/blackbox/samba_dnsupdate.py
@@ -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)