From: Douglas Bagnall Date: Thu, 25 Mar 2021 04:47:04 +0000 (+1300) Subject: pytest/dnsserver: extend record_type_int to all types X-Git-Tag: tevent-0.11.0~1355 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f4b73901175a0caedf8f5de7ffda6bb3f2f2a6c;p=thirdparty%2Fsamba.git pytest/dnsserver: extend record_type_int to all types with improved diagnostics on bad arguments Signed-off-by: Douglas Bagnall Reviewed-by: Jeremy Allison --- diff --git a/python/samba/tests/dcerpc/dnsserver.py b/python/samba/tests/dcerpc/dnsserver.py index 60bad3bd637..604add7e642 100644 --- a/python/samba/tests/dcerpc/dnsserver.py +++ b/python/samba/tests/dcerpc/dnsserver.py @@ -763,23 +763,8 @@ class DnsserverTests(RpcInterfaceTestCase): elif record_type_str == 'TXT': return TXTRecord(record_str) - def record_type_int(self, record_type_str): - if record_type_str == 'A': - return dnsp.DNS_TYPE_A - elif record_type_str == 'AAAA': - return dnsp.DNS_TYPE_AAAA - elif record_type_str == 'PTR': - return dnsp.DNS_TYPE_PTR - elif record_type_str == 'CNAME': - return dnsp.DNS_TYPE_CNAME - elif record_type_str == 'NS': - return dnsp.DNS_TYPE_NS - elif record_type_str == 'MX': - return dnsp.DNS_TYPE_MX - elif record_type_str == 'SRV': - return dnsp.DNS_TYPE_SRV - elif record_type_str == 'TXT': - return dnsp.DNS_TYPE_TXT + def record_type_int(self, s): + return getattr(dnsp, 'DNS_TYPE_' + s) def add_record(self, zone, name, record_type_str, record_str, assertion=True, client_version=dnsserver.DNS_CLIENT_VERSION_LONGHORN):