Tests are still flapping, because it claims it needs a cache rebuild.
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Mar 28 00:04:54 CEST 2017 on sn-devel-144
self.assertTrue("No DNS updates needed" in out, out)
try:
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)
+ rpc_out = self.check_output("samba_dnsupdate --verbose --use-samba-tool --rpc-server-ip=%s" % self.server_ip)
except samba.tests.BlackboxProcessError as e:
self.fail("Error calling samba_dnsupdate: %s" % e)
except samba.tests.BlackboxProcessError as e:
self.fail("Error calling samba_dnsupdate: %s" % e)
- self.assertTrue(" DNS updates and" in out, out)
- self.assertTrue(" DNS deletes needed" in out, out)
+ self.assertTrue(" DNS updates and" in rpc_out, rpc_out)
+ self.assertTrue(" DNS deletes needed" in rpc_out, rpc_out)
out = self.check_output("samba_dnsupdate --verbose")
out = self.check_output("samba_dnsupdate --verbose")
- self.assertTrue("No DNS updates needed" in out, out)
+ self.assertTrue("No DNS updates needed" in out, out + rpc_out)
break
if not found:
rebuild_cache = True
break
if not found:
rebuild_cache = True
+ if opts.verbose:
+ print "need cache add: %s" % d
if opts.all_names:
update_list.append(d)
if opts.verbose:
if opts.all_names:
update_list.append(d)
if opts.verbose:
if found:
continue
rebuild_cache = True
if found:
continue
rebuild_cache = True
+ if opts.verbose:
+ print "need cache remove: %s" % c
if not opts.all_names and not check_dns_name(c):
continue
delete_list.append(c)
if not opts.all_names and not check_dns_name(c):
continue
delete_list.append(c)