]> granicus.if.org Git - pdns/commitdiff
dnsdist: Fix headers handling in the DoH regression tests
authorRemi Gacogne <remi.gacogne@powerdns.com>
Wed, 31 Jul 2019 09:45:21 +0000 (11:45 +0200)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Wed, 31 Jul 2019 11:07:17 +0000 (13:07 +0200)
regression-tests.dnsdist/test_DOH.py

index 75586b92e258f9466bbda06b8987944219d2f8d9..8a09652bd2b42a81f0dafc71658796d8f0fa0772 100644 (file)
@@ -5,7 +5,7 @@ import clientsubnetoption
 from dnsdisttests import DNSDistTest
 
 import pycurl
-from io import StringIO
+from io import BytesIO
 #from hyper import HTTP20Connection
 #from hyper.ssl_compat import SSLContext, PROTOCOL_TLSv1_2
 
@@ -33,7 +33,7 @@ class DNSDistDOHTest(DNSDistTest):
     def sendDOHQuery(cls, port, servername, baseurl, query, response=None, timeout=2.0, caFile=None, useQueue=True, rawQuery=False, customHeaders=[]):
         url = cls.getDOHGetURL(baseurl, query, rawQuery)
         conn = cls.openDOHConnection(port, caFile=caFile, timeout=timeout)
-        response_headers = StringIO()
+        response_headers = BytesIO()
         #conn.setopt(pycurl.VERBOSE, True)
         conn.setopt(pycurl.URL, url)
         conn.setopt(pycurl.RESOLVE, ["%s:%d:127.0.0.1" % (servername, port)])
@@ -170,8 +170,8 @@ class TestDOH(DNSDistDOHTest):
         self.assertTrue(receivedResponse)
         receivedQuery.id = expectedQuery.id
         self.assertEquals(expectedQuery, receivedQuery)
-        self.assertTrue((self._customResponseHeader1) in self._response_headers)
-        self.assertTrue((self._customResponseHeader2) in self._response_headers)
+        self.assertTrue((self._customResponseHeader1) in self._response_headers.decode())
+        self.assertTrue((self._customResponseHeader2) in self._response_headers.decode())
         self.checkQueryEDNSWithoutECS(expectedQuery, receivedQuery)
         self.assertEquals(response, receivedResponse)