diff options
| author | Aaron Haslett <aaronhaslett@catalyst.net.nz> | 2018-07-10 13:14:18 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-07-12 04:31:55 +0200 |
| commit | 8ef42d4dab4dfaf5ad225b33f7748914f14dcd8c (patch) | |
| tree | 7a590cfeebc5cf5dd30be2790d88cf236cc28a0e /python | |
| parent | 86b61551b381520335977cd129955587758f02a3 (diff) | |
| download | samba-8ef42d4dab4dfaf5ad225b33f7748914f14dcd8c.tar.gz | |
dns: update tool changed for scavenging
Now that scavenging is implemented, the DNS update tool needs to be changed so
that it always updates every name required by the DC. Otherwise, the records
might be scavenged.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10812
Signed-off-by: Aaron Haslett <aaronhaslett@catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/tests/blackbox/samba_dnsupdate.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/python/samba/tests/blackbox/samba_dnsupdate.py b/python/samba/tests/blackbox/samba_dnsupdate.py index e6cad3bbaba..c4f14b319dc 100644 --- a/python/samba/tests/blackbox/samba_dnsupdate.py +++ b/python/samba/tests/blackbox/samba_dnsupdate.py @@ -23,6 +23,7 @@ from samba.credentials import Credentials from samba.auth import system_session from samba.samdb import SamDB import ldb +import shutil, os class SambaDnsUpdateTests(samba.tests.BlackboxTestCase): """Blackbox test case for samba_dnsupdate.""" @@ -37,7 +38,10 @@ class SambaDnsUpdateTests(samba.tests.BlackboxTestCase): pass def test_samba_dnsupate_no_change(self): - out = self.check_output("samba_dnsupdate --verbose") + try: + out = self.check_output("samba_dnsupdate --verbose") + except samba.tests.BlackboxProcessError as e: + self.fail("Error calling samba_dnsupdate: %s" % e) self.assertTrue("No DNS updates needed" in out, out) def test_samba_dnsupate_set_ip(self): @@ -83,6 +87,9 @@ class SambaDnsUpdateTests(samba.tests.BlackboxTestCase): self.creds = Credentials() self.creds.guess(self.lp) self.session = system_session() + uc_fn = self.lp.private_path('dns_update_cache') + tmp_uc = uc_fn + '_tmp' + shutil.copyfile(uc_fn, tmp_uc) self.samdb = SamDB(session_info=self.session, credentials=self.creds, @@ -97,13 +104,14 @@ class SambaDnsUpdateTests(samba.tests.BlackboxTestCase): self.samdb.get_config_basedn()), ldb.FLAG_MOD_ADD, "siteList") - out = self.check_output("samba_dnsupdate --verbose") - self.assertTrue("No DNS updates needed" in out, out) + dns_c = "samba_dnsupdate --verbose --use-file={}".format(tmp_uc) + out = self.check_output(dns_c) + self.assertFalse(site_name.lower() in out, out) self.samdb.modify(m) - out = self.check_output("samba_dnsupdate --verbose --use-samba-tool" - " --rpc-server-ip={}".format(self.server_ip)) + shutil.copyfile(uc_fn, tmp_uc) + out = self.check_output(dns_c) self.assertFalse("No DNS updates needed" in out, out) self.assertTrue(site_name.lower() in out, out) |