switch to pytest, as nose is not maintained anymore

Author: fredrikt

.travis.yml

@@ -10,12 +10,12 @@ install:
    - "pip install -r test_requirements.txt"
    - "./setup.py develop"
    - "pip install coveralls"
-   - "pip install nose"
+   - "pip install pytest"
    - "pip install mypy"
-script: 
+script:
    - export PYTHONPATH=./src:$PYTHONPATH
    - coverage erase
-   - coverage run --source=pyff setup.py test
+   - make test
    - mv .coverage .coverage.1
    - coverage combine
    - make typecheck

Makefile

@@ -1,4 +1,9 @@
-SOURCE=		src
+TOPDIR:=	$(abspath .)
+SRCDIR=		$(TOPDIR)/src
+SOURCE=		$(SRCDIR)/pyff
+
+test:
+	PYTHONPATH=$(SRCDIR) pytest
 
 reformat:
 	isort --line-width 120 --atomic --project eduid_scimapi --recursive $(SOURCE)

requirements.txt

@@ -6,7 +6,6 @@ httplib2 >=0.7.7
 ipaddr
 lxml >=4.1.1
 mako
-nose
 pyXMLSecurity >=0.15
 pyconfig
 pyramid

setup.py

@@ -14,6 +14,7 @@
 __author__ = 'Leif Johansson'
 __version__ = '2.0.0'
 
+
 def load_requirements(path: PurePath) -> List[str]:
     """ Load dependencies from a requirements.txt style file, ignoring comments etc. """
     res = []
@@ -27,6 +28,7 @@ def load_requirements(path: PurePath) -> List[str]:
             res += [line]
     return res
 
+
 here = PurePath(__file__)
 README = open(here.with_name('README.rst')).read()
 NEWS = open(here.with_name('NEWS.txt')).read()
@@ -36,45 +38,35 @@ def load_requirements(path: PurePath) -> List[str]:
 
 python_implementation_str = python_implementation()
 
-setup(name='pyFF',
-      version=__version__,
-      description="Federation Feeder",
-      long_description=README + '\n\n' + NEWS,
-      classifiers=[
-          # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
-         'Programming Language :: Python :: 3',
-         'Programming Language :: Python :: 3.7',
-         'Programming Language :: Python :: 3.8',
-      ],
-      keywords='identity federation saml metadata',
-      author=__author__,
-      author_email='leifj@sunet.se',
-      url='https://pyff.io',
-      license='BSD',
-      setup_requires=['nose>=1.0'],
-      tests_require=tests_require,
-      test_suite="nose.collector",
-      packages=find_packages('src'),
-      package_dir={'': 'src'},
-      include_package_data=True,
-      package_data={
-          'pyff': ['xslt/*.xsl', 'schema/*.xsd']
-      },
-      zip_safe=False,
-      install_requires=install_requires,
-      scripts=['scripts/mirror-mdq.sh'],
-      entry_points={
-          'console_scripts': ['pyff=pyff.md:main', 'pyffd=pyff.mdq:main', 'samldiff=pyff.tools:difftool'],
-          'paste.app_factory': [
-             'pyffapp=pyff.wsgi:app_factory'
-          ],
-          'paste.server_runner': [
-             'pyffs=pyff.wsgi:server_runner'
-          ],
-      },
-      message_extractors={'src': [
-          ('**.py', 'python', None),
-          ('**/templates/**.html', 'mako', None),
-      ]},
-      python_requires='>=3.7',
-      )
+setup(
+    name='pyFF',
+    version=__version__,
+    description="Federation Feeder",
+    long_description=README + '\n\n' + NEWS,
+    classifiers=[
+        # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+    ],
+    keywords='identity federation saml metadata',
+    author=__author__,
+    author_email='leifj@sunet.se',
+    url='https://pyff.io',
+    license='BSD',
+    tests_require=tests_require,
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
+    include_package_data=True,
+    package_data={'pyff': ['xslt/*.xsl', 'schema/*.xsd']},
+    zip_safe=False,
+    install_requires=install_requires,
+    scripts=['scripts/mirror-mdq.sh'],
+    entry_points={
+        'console_scripts': ['pyff=pyff.md:main', 'pyffd=pyff.mdq:main', 'samldiff=pyff.tools:difftool'],
+        'paste.app_factory': ['pyffapp=pyff.wsgi:app_factory'],
+        'paste.server_runner': ['pyffs=pyff.wsgi:server_runner'],
+    },
+    message_extractors={'src': [('**.py', 'python', None), ('**/templates/**.html', 'mako', None),]},
+    python_requires='>=3.7',
+)

src/pyff/test/test_pipeline.py

@@ -3,6 +3,7 @@
 import sys
 import tempfile
 
+import pytest
 import six
 import yaml
 from mako.lookup import TemplateLookup
@@ -24,6 +25,20 @@
 
 
 class PipeLineTest(SignerTestCase):
+    @pytest.fixture(autouse=True)
+    def _capsys(self, capsys):
+        self.capsys = capsys
+
+    @property
+    def captured_stdout(self):
+        out, _err = self.capsys.readouterr()
+        return out
+
+    @property
+    def captured_stderr(self):
+        _out, err = self.capsys.readouterr()
+        return err
+
     def run_pipeline(self, pl_name, ctx=None, md=None):
         if ctx is None:
             ctx = dict()
@@ -56,19 +71,6 @@ def setUp(self):
         self.templates = TemplateLookup(directories=[os.path.join(self.datadir, 'simple-pipeline')])
 
 
-class StreamCapturing(object):
-    def __init__(self, stream):
-        self.captured = []
-        self.stream = stream
-
-    def __getattr__(self, attr):
-        return getattr(self.stream, attr)
-
-    def write(self, data):
-        self.captured.append(data)
-        self.stream.write(data)
-
-
 class ParseTest(PipeLineTest):
     def parse_test(self):
         self.output = tempfile.NamedTemporaryFile('w').name
@@ -456,23 +458,22 @@ def test_cert_report_swamid(self):
             print(fd.read())
 
     def test_info_and_dump(self):
-        with patch("sys.stdout", StreamCapturing(sys.stdout)) as ctx:
-            try:
-                self.exec_pipeline(
-                    """
+        try:
+            self.exec_pipeline(
+                """
 - load:
   - http://mds.swamid.se/md/swamid-2.0.xml
 - select
 - dump
 - info
 """
-                )
-                assert 'https://idp.nordu.net/idp/shibboleth' in sys.stdout.captured
-            except IOError:
-                pass
+            )
+            assert 'https://idp.nordu.net/idp/shibboleth' in self.captured_stdout
+        except IOError:
+            pass
 
     def test_end_exit(self):
-        with patch.multiple("sys", exit=self.sys_exit, stdout=StreamCapturing(sys.stdout)):
+        with patch.multiple("sys", exit=self.sys_exit):
             try:
                 self.exec_pipeline(
                     """
@@ -486,21 +487,18 @@ def test_end_exit(self):
                 pass
             except ExitException as ex:
                 assert ex.code == 22
-                assert "slartibartifast" in "".join(sys.stdout.captured)
+                assert "slartibartifast" in self.captured_stdout
 
     def test_single_dump(self):
-        with patch.multiple("sys", exit=self.sys_exit, stdout=StreamCapturing(sys.stdout)):
-            try:
-                self.exec_pipeline(
-                    """
+        try:
+            self.exec_pipeline(
+                """
 - dump
 """
-                )
-                assert '<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"/>' in "".join(
-                    sys.stdout.captured
-                )
-            except IOError:
-                pass
+            )
+            assert '<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"/>' in self.captured_stdout
+        except IOError:
+            pass
 
     def test_missing_select(self):
         for stmt in (

test_requirements.txt

@@ -1,11 +1,12 @@
 coverage
 fakeredis>=1.0.5
 funcsigs
+isort
 mako
 mock
-nose>=1.0
 pbr
+pytest
+pytest-cov
 setuptools
 testfixtures
 wsgi_intercept
-isort