Allow testing without gssapi and ipaclient

Make tests pass without presence of requests_gssapi or ipaclient
package.

Signed-off-by: Christian Heimes <[email protected]>

.travis.yml

@@ -14,18 +14,22 @@ addons:
 matrix:
   include:
     - python: 2.7
-      env: TOXENV=py27
+      env: TOXENV=py27-extras
+    - python: 2.7
+      env: TOXENV=py27-noextras
     - python: 3.5
-      env: TOXENV=py35
+      env: TOXENV=py35-extras
+    - python: 3.6
+      env: TOXENV=py36-extras
+    - python: 3.6
+      env: TOXENV=py36-noextras
     - python: 3.6
-      env: TOXENV=py36
-    - python: 3.5
       env: TOXENV=doc
     - python: 3.6
       env: TOXENV=lint
     - python: 2.7
       env: TOXENV=pep8py2
-    - python: 3.5
+    - python: 3.6
       env: TOXENV=pep8py3
 
 before_install:

Makefile

@@ -65,10 +65,9 @@ cscope:
 	git ls-files | xargs pycscope
 
 test: clean_socket clean_coverage
-	$(TOX) --skip-missing-interpreters -e py27
-	$(TOX) --skip-missing-interpreters -e py34
-	$(TOX) --skip-missing-interpreters -e py35
-	$(TOX) --skip-missing-interpreters -e py36
+	$(TOX) --skip-missing-interpreters -e py27-extra,py27-noextra
+	$(TOX) --skip-missing-interpreters -e py35-extra,py35-noextra
+	$(TOX) --skip-missing-interpreters -e py36-extra,py36-noextra
 	$(TOX) --skip-missing-interpreters -e doc
 	$(TOX) -e coverage-report
 

setup.py

@@ -45,18 +45,18 @@ def run(self):
 ]
 
 # test requirements
-test_requires = [
-    'coverage', 'pytest'
-] + gssapi_requires + ipa_requires
+test_requires = ['coverage', 'pytest']
+test_extras_requires = test_requires + gssapi_requires + ipa_requires
 
 extras_require = {
     'gssapi': gssapi_requires,
     'ipa': ipa_requires,
     'test': test_requires,
+    'test_extras': test_extras_requires,
     'test_docs': ['docutils', 'markdown', 'sphinx-argparse',
                   'sphinxcontrib-spelling'] + ipa_requires,
     'test_pep8': ['flake8', 'flake8-import-order', 'pep8-naming'],
-    'test_pylint': ['pylint'] + test_requires,
+    'test_pylint': ['pylint'] + test_extras_requires,
 }
 
 # backwards compatibility with old setuptools

tests/test_custodia.py

@@ -17,7 +17,10 @@
 
 import requests.exceptions
 
-import requests_gssapi
+try:
+    import requests_gssapi
+except ImportError:
+    requests_gssapi = None
 
 import six
 
@@ -529,6 +532,10 @@ def test_C_client_cert_auth(self):
         self.client.del_secret('test/key')
 
 
+@pytest.mark.skipif(
+    requests_gssapi is None,
+    reason="requests_gssapi not available"
+)
 class CustodiaGSSAPITests(unittest.TestCase):
     def test_set_gssapi_auth(self):
         client = CustodiaSimpleClient('http://local.example')

tests/test_ipa.py

@@ -8,19 +8,27 @@
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import serialization
 
-import ipaclient.plugins.vault
-
-import ipalib
-from ipalib.errors import NotFound
-
 import pkg_resources
 
 import pytest
 
 from custodia.compat import configparser
-from custodia.ipa.certrequest import IPACertRequest
-from custodia.ipa.interface import IPAInterface, IPA_SECTIONNAME
-from custodia.ipa.vault import IPAVault, krb5_unparse_principal_name
+
+try:
+    import ipaclient.plugins.vault
+    import ipalib
+except ImportError:
+    HAS_IPA = False
+    NotFound = None
+    IPACertRequest = None
+    IPAInterface = IPA_SECTIONNAME = None
+    IPAVault = krb5_unparse_principal_name = None
+else:
+    HAS_IPA = True
+    from ipalib.errors import NotFound
+    from custodia.ipa.certrequest import IPACertRequest
+    from custodia.ipa.interface import IPAInterface, IPA_SECTIONNAME
+    from custodia.ipa.vault import IPAVault, krb5_unparse_principal_name
 
 try:
     from unittest import mock
@@ -172,6 +180,7 @@
 
 
 @pytest.mark.skipif(mock is None, reason='requires mock')
+@pytest.mark.skipif(not HAS_IPA, reason='requires ipaclient package')
 class BaseTest(object):
     def setup_method(self, method):
         # pylint: disable=attribute-defined-outside-init
@@ -399,6 +408,7 @@ def test_get(self):
         certreq.get('keys/HTTP/client1.ipa.example')
 
 
+@pytest.mark.skipif(not HAS_IPA, reason='requires ipaclient package')
 @pytest.mark.parametrize('group,name,cls', [
     ('custodia.stores', 'IPAVault', IPAVault),
     ('custodia.stores', 'IPACertRequest', IPACertRequest),
@@ -415,6 +425,7 @@ def test_plugins(group, name, cls, dist='custodia'):
     assert resolved is cls
 
 
+@pytest.mark.skipif(not HAS_IPA, reason='requires ipaclient package')
 @pytest.mark.parametrize('principal,result', [
     ('[email protected]',
      (None, 'john', 'IPA.EXAMPLE')),

tests/test_plugins.py

@@ -8,6 +8,14 @@
 from custodia.client import CustodiaHTTPClient
 from custodia.plugin import CSStore, HTTPAuthenticator, HTTPAuthorizer
 
+try:
+    # pylint: disable=unused-import
+    import ipaclient  # noqa: F401
+except ImportError:
+    HAS_IPA = False
+else:
+    HAS_IPA = True
+
 
 class TestCustodiaPlugins(unittest.TestCase):
     project_name = 'custodia'
@@ -18,6 +26,9 @@ def get_entry_points(self, group):
             if e.dist.project_name != self.project_name:
                 # only interested in our own entry points
                 continue
+            if not HAS_IPA and e.module_name.startswith('custodia.ipa'):
+                # skip IPA plugins when ipaclient isn't installed
+                continue
             eps.append(e)
         return eps
 

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.3.1
-envlist = lint,py27,py35,py36,pep8py2,pep8py3,doc,coverage-report
+envlist = lint,py{27,35,36}-{extras,noextras},pep8py2,pep8py3,doc,coverage-report
 skip_missing_interpreters = true
 
 [testenv]
@@ -9,7 +9,8 @@ skip_missing_interpreters = true
 #     CUSTODIAPYTHON = {envpython} -m coverage run --parallel
 # passenv = CUSTODIAPYTHON
 deps =
-    .[test]
+    extras: .[test_extras]
+    noextras: .[test]
 # Makefile and RPM spec set sitepackages=True
 sitepackages = False
 commands =