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

diff --git a/dns/resolver.py b/dns/resolver.py
index 77339113753638b910c347044e6e64b767567c79..e50eab8da6087c035deeabd52f41712d1f8debba 100644 (file)
--- 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 39bfbf03eb990a34f30937a44bda385d880c1c01..95dd9ae99d336b7613e43c8c1aadcb6c60cf231b 100644 (file)
--- 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):