jjb/python-jenkins
Code Issues Proposed changes

Do not require requests-kerberos for tests

Browse Source 
The test for kerberos was dropped in
34cca0c4d9, as it was not needed for the
simpler implementation with requests. Let's drop the requests-kerberos
from test dependencies as well, as it has only caused troubles in other
tests - at least for me.

One had to set jenkins.requests_kerberos to None, as was done in the
tests.base.JenkinsTestBase. In places where it was not set to None, the
jenkins.Jenkins.jenkins_open tried the kerberos authentication in
addition to anonymous authentication on the /api/json endpoint.

This was the case for
  tests.test_jenkins_sockets.JenkinsRequestTimeoutTests.test_jenkins_open_timeout
where it has resulted in a different exception than was expected:

  Traceback (most recent call last):
    File "tests/test_jenkins_sockets.py", line 31, in test_jenkins_open_timeout
      j.jenkins_open(request, add_crumb=False)
    File "jenkins/__init__.py", line 533, in jenkins_open
      return self.jenkins_request(req, add_crumb, resolve_auth).text
    File "jenkins/__init__.py", line 547, in jenkins_request
      self._maybe_add_auth()
    File "jenkins/__init__.py", line 384, in _maybe_add_auth
      % '\n'.join(failures))
  jenkins.JenkinsException: Unable to authenticate with any scheme:
  auth(kerberos) Error in request: HTTPConnectionPool(host='127.0.0.1', port=33921): Read timed out. (read timeout=0.1)
  auth(anonymous) Error in request: HTTPConnectionPool(host='127.0.0.1', port=33921): Read timed out. (read timeout=0.1)

Change-Id: I45cbb3a666ee6a9ecbe628ca8b7f0b07dcfcb0eb
This commit is contained in:
Jan Hruban
2018-05-11 22:24:36 +02:00
parent 5f5d54b897
commit 1946ed303b
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test-requirements.txt
View File

@@ -4,7 +4,6 @@ mock<1.1
unittest2 unittest2
python-subunit python-subunit
requests-mock>=1.4.0 requests-mock>=1.4.0
requests-kerberos
sphinx>=1.2,<1.3.0 sphinx>=1.2,<1.3.0
stestr>=2.0.0 stestr>=2.0.0
testscenarios testscenarios

2
tests/base.py
View File

@@ -24,8 +24,6 @@ class JenkinsTestBase(TestWithScenarios, unittest.TestCase):
def setUp(self): def setUp(self):
super(JenkinsTestBase, self).setUp() super(JenkinsTestBase, self).setUp()
# TODO(darragh) would be useful if this could be mocked
jenkins.requests_kerberos = None
self.j = jenkins.Jenkins(self.base_url, 'test', 'test') self.j = jenkins.Jenkins(self.base_url, 'test', 'test')