From: Garming Sam Date: Wed, 15 Jun 2016 04:32:23 +0000 (+1200) Subject: flapping: temporarily add samba_dnsupdate test X-Git-Tag: tdb-1.3.10~832 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2743b110fbd9731c38160c2a9919a3f5e82f1fc;p=thirdparty%2Fsamba.git flapping: temporarily add samba_dnsupdate test This should be removed when we can run nsupdate on sn-devel Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Autobuild-User(master): Garming Sam Autobuild-Date(master): Thu Jun 16 08:37:56 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 613615e8a55..852a31afde4 100644 --- a/python/samba/tests/blackbox/samba_dnsupdate.py +++ b/python/samba/tests/blackbox/samba_dnsupdate.py @@ -41,9 +41,18 @@ class SambaDnsUpdateTests(samba.tests.BlackboxTestCase): self.assertTrue(" DNS deletes needed" in out) except samba.tests.BlackboxProcessError: pass - out = self.check_output("samba_dnsupdate --verbose --use-nsupdate --current-ip=10.0.0.1") + + try: + out = self.check_output("samba_dnsupdate --verbose --use-nsupdate --current-ip=10.0.0.1") + except samba.tests.BlackboxProcessError: + self.fail("Error calling samba_dnsupdate") + self.assertTrue("No DNS updates needed" in out) - out = self.check_output("samba_dnsupdate --verbose --use-samba-tool --rpc-server-ip=%s" % self.server_ip) + 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) out = self.check_output("samba_dnsupdate --verbose") diff --git a/selftest/flapping b/selftest/flapping index e5995eff011..425cf8c20ee 100644 --- a/selftest/flapping +++ b/selftest/flapping @@ -31,3 +31,4 @@ # This test just is not reliable in finding the max search limit # ^samba4.ldap.notification.python\(.*\).__main__.LDAPNotificationTest.test_max_search +^samba.tests.blackbox.samba_dnsupdate.* # missing nsupdate on sn-devel