pytests/dns: import dnsserver.TXTRecord directly
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Wed, 7 Apr 2021 03:16:58 +0000 (15:16 +1200)
committerDouglas Bagnall <dbagnall@samba.org>
Thu, 8 Apr 2021 21:54:35 +0000 (21:54 +0000)
Not through samba-tool, which should not be used as a library.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
python/samba/tests/dns.py
python/samba/tests/dns_forwarder.py

index 77aa43a856fdd7834eb5e6067ab315426e3d879f..26393f1c0887b1c05bc113105911ebaa7e4f1404 100644 (file)
@@ -30,7 +30,8 @@ import socket
 import samba.ndr as ndr
 from samba import credentials
 from samba.dcerpc import dns, dnsp, dnsserver
-from samba.netcmd.dns import TXTRecord, dns_record_match, data_to_dns_record
+from samba.dnsserver import TXTRecord
+from samba.netcmd.dns import dns_record_match, data_to_dns_record
 from samba.tests.subunitrun import SubunitOptions, TestProgram
 from samba import werror, WERRORError
 from samba.tests.dns_base import DNSTest
index 0af885913a8157719878ea0b78a5fb5d9d9c6c8b..53baa3bb17279d72756e5a9d2b1967294b6c0233 100644 (file)
@@ -27,7 +27,8 @@ import samba.ndr as ndr
 from samba import credentials, param
 from samba.tests import TestCase
 from samba.dcerpc import dns, dnsp, dnsserver
-from samba.netcmd.dns import TXTRecord, dns_record_match, data_to_dns_record
+from samba.dnsserver import TXTRecord
+from samba.netcmd.dns import dns_record_match, data_to_dns_record
 from samba.tests.subunitrun import SubunitOptions, TestProgram
 import samba.getopt as options
 import optparse