From: Bob Halley <halley@dnspython.org>
Date: Thu, 21 May 2020 21:27:06 +0000 (-0700)
Subject: pop() with no arguements means last, but I used it intending first
X-Git-Tag: v2.0.0rc1~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb39125ac51754ca6f92ef7187b7aaa09ad0dd9b;p=thirdparty%2Fdnspython.git

pop() with no arguements means last, but I used it intending first
---

diff --git a/dns/resolver.py b/dns/resolver.py
index 77339113..e50eab8d 100644
--- a/dns/resolver.py
+++ b/dns/resolver.py
@@ -547,7 +547,7 @@ class _Resolution(object):
             raise NXDOMAIN(qnames=self.qnames_to_try,
                            responses=self.nxdomain_responses)
 
-        self.qname = self.qnames.pop()
+        self.qname = self.qnames.pop(0)
 
         # Do we know the answer?
         if self.resolver.cache:
@@ -598,7 +598,7 @@ class _Resolution(object):
             backoff = self.backoff
             self.backoff = min(self.backoff * 2, 2)
 
-        self.nameserver = self.current_nameservers.pop()
+        self.nameserver = self.current_nameservers.pop(0)
         self.port = self.resolver.nameserver_ports.get(self.nameserver,
                                                        self.resolver.port)
         self.tcp_attempt = self.tcp
diff --git a/tests/test_resolution.py b/tests/test_resolution.py
index 39bfbf03..95dd9ae9 100644
--- a/tests/test_resolution.py
+++ b/tests/test_resolution.py
@@ -33,11 +33,11 @@ class ResolutionTestCase(unittest.TestCase):
                                              False, True, False)
         (request, answer) = self.resn.next_request()
         self.assertTrue(answer is None)
-        self.assertEqual(request.question[0].name, abs_qname_1)
+        self.assertEqual(request.question[0].name, self.qname)
         self.assertEqual(request.question[0].rdtype, dns.rdatatype.A)
         (request, answer) = self.resn.next_request()
         self.assertTrue(answer is None)
-        self.assertEqual(request.question[0].name, self.qname)
+        self.assertEqual(request.question[0].name, abs_qname_1)
         self.assertEqual(request.question[0].rdtype, dns.rdatatype.A)
 
     def test_next_request_exhaust_causes_nxdomain(self):