[SCM] Samba Shared Repository - branch master updated
Garming Sam
garming at samba.org
Mon Jul 11 08:59:03 UTC 2016
The branch, master has been updated
via 4c4c3e0 tests/dns_update: Add error message for diagnosis
from 6efd0af s3-rpc_server/mdssd: use smbd_reinit_after_fork()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4c4c3e0fcf88753374fdb279b4519989501ede2f
Author: Garming Sam <garming at catalyst.net.nz>
Date: Mon Jul 11 17:20:40 2016 +1200
tests/dns_update: Add error message for diagnosis
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Garming Sam <garming at samba.org>
Autobuild-Date(master): Mon Jul 11 10:58:16 CEST 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
python/samba/tests/blackbox/samba_dnsupdate.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/tests/blackbox/samba_dnsupdate.py b/python/samba/tests/blackbox/samba_dnsupdate.py
index 852a31a..8cf367f 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)
--
Samba Shared Repository
More information about the samba-cvs
mailing list