pytest:dns_base: make_txt_update can set arbitrary TTL

Also, improve a variable name.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/dns_base.py b/python/samba/tests/dns_base.py
index e522120b932b073ec3ddf5b391972f6ca033fa2b..b92371e9cdd5cfc6898de0c3a0b7ba46ca203bda 100644 (file)
--- a/python/samba/tests/dns_base.py
+++ b/python/samba/tests/dns_base.py
@@ -165,11 +165,11 @@ class DNSTest(TestCaseInTempDir):
         self.assertEqual(my_packet, recv_packet[2:])
         return (response, recv_packet[2:])
 
-    def make_txt_update(self, prefix, txt_array, domain=None):
+    def make_txt_update(self, prefix, txt_array, zone=None, ttl=900):
         p = self.make_name_packet(dns.DNS_OPCODE_UPDATE)
         updates = []
 
-        name = domain or self.get_dns_domain()
+        name = zone or self.get_dns_domain()
         u = self.make_name_question(name, dns.DNS_QTYPE_SOA, dns.DNS_QCLASS_IN)
         updates.append(u)
         self.finish_name_packet(p, updates)
@@ -179,7 +179,7 @@ class DNSTest(TestCaseInTempDir):
         r.name = "%s.%s" % (prefix, name)
         r.rr_type = dns.DNS_QTYPE_TXT
         r.rr_class = dns.DNS_QCLASS_IN
-        r.ttl = 900
+        r.ttl = ttl
         r.length = 0xffff
         rdata = self.make_txt_record(txt_array)
         r.rdata = rdata