flapping: temporarily add samba_dnsupdate test
authorGarming Sam <garming@catalyst.net.nz>
Wed, 15 Jun 2016 04:32:23 +0000 (16:32 +1200)
committerGarming Sam <garming@samba.org>
Thu, 16 Jun 2016 06:37:56 +0000 (08:37 +0200)
This should be removed when we can run nsupdate on sn-devel

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): Thu Jun 16 08:37:56 CEST 2016 on sn-devel-144

python/samba/tests/blackbox/samba_dnsupdate.py
selftest/flapping

index 613615e8a554b53b1e859ba108d8493944a67448..852a31afde4169c8283a8b00713e780ff601384e 100644 (file)
@@ -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")
index e5995eff011f77367de91739c556db21b2d72b19..425cf8c20eeb7375e7eece7b5f5f2a1c078731e9 100644 (file)
@@ -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