Merge pull request #283 from rebeckag/test_updates

Test updates

.travis.yml

@@ -3,8 +3,8 @@ language: python
 sudo: false
 
 env:
-  - TOX_ENV=py27
+  - TOXENV=py27
-  - TOX_ENV=py34
+  - TOXENV=py34
 
 addons:
   apt:
@@ -14,5 +14,8 @@ addons:
 services:
   - mongodb
 
+install:
+  - pip install -U tox
+
 script:
-  - ./setup.py test
+  - tox

setup.py

@@ -6,21 +6,6 @@ import sys
 from setuptools import setup
 from setuptools.command.test import test as TestCommand
 
-
-class PyTest(TestCommand):
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        #import here, cause outside the eggs aren't loaded
-        import pytest
-        errno = pytest.main(self.test_args)
-        sys.exit(errno)
-
-
 install_requires = [
     # core dependencies
     'decorator',
@@ -35,17 +20,6 @@ install_requires = [
     'six'
 ]
 
-tests_require = [
-    'mongodict',
-    'pyasn1',
-    'pymongo==3.0.1',
-    'python-memcached >= 1.51',
-    'pytest',
-    'mako',
-    'webob',
-    #'pytest-coverage',
-]
-
 version = ''
 with open('src/saml2/__init__.py', 'r') as fd:
     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
@@ -78,13 +52,6 @@ setup(
 
     scripts=["tools/parse_xsd2.py", "tools/make_metadata.py",
              "tools/mdexport.py", "tools/merge_metadata.py"],
-
-    tests_require=tests_require,
-    extras_require={
-        'testing': tests_require,
-    },
     install_requires=install_requires,
     zip_safe=False,
-    test_suite='tests',
-    cmdclass={'test': PyTest},
 )

tests/idp_conf_sp_no_encrypt.py

@@ -36,7 +36,6 @@ CONFIG = {
                     # }
                 }
             },
-            "subject_data": full_path("subject_data_3.db"),
             #"domain": "umu.se",
             #"name_qualifier": ""
         },

tests/idp_conf_verify_cert.py

@@ -45,7 +45,6 @@ CONFIG = {
                     # }
                 }
             },
-            "subject_data": full_path("subject_data_2.db"),
             #"domain": "umu.se",
             #"name_qualifier": ""
         },

tox.ini

@@ -2,9 +2,6 @@
 envlist = py27,py34
 
 [testenv]
-basepython =
+deps = pytest
-    py27: python2.7
+       pymongo==3.0.1
-    py34: python3.4
+commands = py.test tests/
-
-deps =
-    pytest