From 9ba49ee677e90dcf3f5776f5e26a63fed9a4e6d1 Mon Sep 17 00:00:00 2001 From: Justin Riley Date: Wed, 3 Aug 2016 12:01:41 -0400 Subject: [PATCH] tests: move dns query code to onedns.tests.utils --- onedns/tests/test_dynamicresolver.py | 10 +++------- onedns/tests/utils.py | 9 +++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 onedns/tests/utils.py diff --git a/onedns/tests/test_dynamicresolver.py b/onedns/tests/test_dynamicresolver.py index b64a5a8..33159a5 100644 --- a/onedns/tests/test_dynamicresolver.py +++ b/onedns/tests/test_dynamicresolver.py @@ -3,6 +3,7 @@ import dnslib from IPy import IP +from onedns.tests import utils from onedns.tests import conftest @@ -23,9 +24,7 @@ def test_lookup(dns, qname, qtype, output): dns.clear() dns.add_host(HOST, HOST_IP) try: - q = dnslib.DNSRecord(q=dnslib.DNSQuestion(qname, qtype)) - a_pkt = q.send(conftest.INTERFACE, conftest.PORT, tcp=False) - a = dnslib.DNSRecord.parse(a_pkt) + a = utils.dnsquery(qname, qtype) assert a.short() == output finally: dns.close() @@ -34,10 +33,7 @@ def test_lookup(dns, qname, qtype, output): def test_nxdomain(dns): dns.clear() try: - q = dnslib.DNSRecord(q=dnslib.DNSQuestion( - 'unknownhost', dnslib.QTYPE.A)) - a_pkt = q.send(conftest.INTERFACE, conftest.PORT, tcp=False) - a = dnslib.DNSRecord.parse(a_pkt) + a = utils.dnsquery('unknownhost', dnslib.QTYPE.A) assert dnslib.RCODE.get(a.header.rcode) == 'NXDOMAIN' finally: dns.close() diff --git a/onedns/tests/utils.py b/onedns/tests/utils.py new file mode 100644 index 0000000..f2a8d60 --- /dev/null +++ b/onedns/tests/utils.py @@ -0,0 +1,9 @@ +import dnslib + +from onedns.tests import conftest + + +def dnsquery(qname, qtype): + q = dnslib.DNSRecord(q=dnslib.DNSQuestion(qname, qtype)) + a_pkt = q.send(conftest.INTERFACE, conftest.PORT, tcp=False) + return dnslib.DNSRecord.parse(a_pkt)