diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2017-05-31 13:57:25 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-06-10 21:48:21 +0200 |
| commit | 589a6621ee4bc4ba69c436b1c304f7de3efda627 (patch) | |
| tree | 9c31657282de2a950342e235457c357db5ec2c0b /python | |
| parent | 3d313f7da5e576f6947672368971484e20c4134c (diff) | |
| download | samba-589a6621ee4bc4ba69c436b1c304f7de3efda627.tar.gz | |
selftest: move make_txt_record() onto self in samba.tests.dns
This will help unifying dns.py and dns_tkey.py to use common subclasses
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/tests/dns.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/python/samba/tests/dns.py b/python/samba/tests/dns.py index 43eccddd957..50d7fb60c2f 100644 --- a/python/samba/tests/dns.py +++ b/python/samba/tests/dns.py @@ -60,14 +60,6 @@ server_name = args[0] server_ip = args[1] creds.set_krb_forwardable(credentials.NO_KRB_FORWARDABLE) -def make_txt_record(records): - rdata_txt = dns.txt_record() - s_list = dnsp.string_list() - s_list.count = len(records) - s_list.str = records - rdata_txt.txt = s_list - return rdata_txt - class DNSTest(TestCase): def setUp(self): @@ -131,6 +123,14 @@ class DNSTest(TestCase): q.question_class = qclass return q + def make_txt_record(self, records): + rdata_txt = dns.txt_record() + s_list = dnsp.string_list() + s_list.count = len(records) + s_list.str = records + rdata_txt.txt = s_list + return rdata_txt + def get_dns_domain(self): "Helper to get dns domain" return self.creds.get_realm().lower() @@ -193,7 +193,7 @@ class DNSTest(TestCase): r.rr_class = dns.DNS_QCLASS_IN r.ttl = 900 r.length = 0xffff - rdata = make_txt_record(txt_array) + rdata = self.make_txt_record(txt_array) r.rdata = rdata updates.append(r) p.nscount = len(updates) @@ -560,7 +560,7 @@ class TestDNSUpdates(DNSTest): r.rr_class = dns.DNS_QCLASS_IN r.ttl = 900 r.length = 0xffff - rdata = make_txt_record(['"This is a test"']) + rdata = self.make_txt_record(['"This is a test"']) r.rdata = rdata updates.append(r) p.nscount = len(updates) @@ -596,7 +596,7 @@ class TestDNSUpdates(DNSTest): r.rr_class = dns.DNS_QCLASS_NONE r.ttl = 0 r.length = 0xffff - rdata = make_txt_record(['"This is a test"']) + rdata = self.make_txt_record(['"This is a test"']) r.rdata = rdata updates.append(r) p.nscount = len(updates) @@ -638,7 +638,7 @@ class TestDNSUpdates(DNSTest): r.rr_class = dns.DNS_QCLASS_IN r.ttl = 900 r.length = 0xffff - rdata = make_txt_record(['"This is a test"']) + rdata = self.make_txt_record(['"This is a test"']) r.rdata = rdata updates.append(r) p.nscount = len(updates) @@ -674,7 +674,7 @@ class TestDNSUpdates(DNSTest): r.rr_class = dns.DNS_QCLASS_NONE r.ttl = 0 r.length = 0xffff - rdata = make_txt_record(['"This is a test"']) + rdata = self.make_txt_record(['"This is a test"']) r.rdata = rdata updates.append(r) p.nscount = len(updates) @@ -711,7 +711,7 @@ class TestDNSUpdates(DNSTest): r.rr_class = dns.DNS_QCLASS_IN r.ttl = 900 r.length = 0xffff - rdata = make_txt_record(['"This is a test"']) + rdata = self.make_txt_record(['"This is a test"']) r.rdata = rdata updates.append(r) p.nscount = len(updates) |