Merge "Make the kerberos support python3 ready"

Jenkins · openstack-gerrit · commit e39c4dcbd1a8 · 2016-04-29T19:06:12.000Z
diff --git a/jenkins/urllib_kerb.py b/jenkins/urllib_kerb.py
@@ -52,7 +52,7 @@ def http_error_401(self, req, fp, code, msg, headers):
 
             self.tries += 1
             try:
-                krb_resp = self._krb_response(req.get_host(), krb_req)
+                krb_resp = self._krb_response(req.host, krb_req)
 
                 req.add_unredirected_header('Authorization',
                                             "Negotiate %s" % krb_resp)
diff --git a/tests/test_kerberos.py b/tests/test_kerberos.py
@@ -1,6 +1,7 @@
 import kerberos
 assert kerberos  # pyflakes
 from mock import patch, Mock
+from six.moves.urllib.request import Request
 import testtools
 
 from jenkins import urllib_kerb
@@ -23,7 +24,7 @@ def test_http_error_401_simple(self, clean_mock, init_mock, step_mock, response_
         parent_return_mock.headers = {'www-authenticate': "Negotiate bar"}
         parent_mock.open.return_value = parent_return_mock
 
-        request_mock = Mock()
+        request_mock = Mock(spec=self._get_dummy_request())
         h = urllib_kerb.HTTPNegotiateHandler()
         h.add_parent(parent_mock)
         rv = h.http_error_401(request_mock, "", "", "", headers_from_server)
@@ -48,7 +49,8 @@ def test_http_error_401_gsserror(self, clean_mock, init_mock, step_mock, respons
         init_mock.side_effect = kerberos.GSSError
 
         h = urllib_kerb.HTTPNegotiateHandler()
-        rv = h.http_error_401(Mock(), "", "", "", headers_from_server)
+        rv = h.http_error_401(Mock(spec=self._get_dummy_request()), "", "", "",
+                              headers_from_server)
         self.assertEqual(rv, None)
 
     @patch('kerberos.authGSSClientResponse')
@@ -59,7 +61,8 @@ def test_http_error_401_empty(self, clean_mock, init_mock, step_mock, response_m
         headers_from_server = {}
 
         h = urllib_kerb.HTTPNegotiateHandler()
-        rv = h.http_error_401(Mock(), "", "", "", headers_from_server)
+        rv = h.http_error_401(Mock(spec=self._get_dummy_request()), "", "", "",
+                              headers_from_server)
         self.assertEqual(rv, None)
 
     @patch('kerberos.authGSSClientResponse')
@@ -114,3 +117,8 @@ def test_extract_krb_value_invalid(self):
         h = urllib_kerb.HTTPNegotiateHandler()
         with testtools.ExpectedException(ValueError):
             h._extract_krb_value(headers_from_server)
+
+    def _get_dummy_request(self):
+        r = Request('http://example.com')
+        r.timeout = 10
+        return r
