Migrate tests to Pytest (#337)

* Remove unnecessary requirements.txt

* Make complete changeover to pytest

* More pytest porting

* Fix Appveyor, missing typechecking

* Get rid of collections import warning

* Mock out AppFS user directories

* Remove confusing stack trace change via six

* Update changelog

* Forgot create=True in a test

* Document test changes in Implementing

* PR feedback

* Add `slow` markers back in

* Accumulate coverage across versions

* Update changelog

* Remove unused import.

* Enable branch coverage

Author: dargueta

.travis.yml

@@ -1,34 +1,25 @@
+dist: xenial
 sudo: false
 language: python
 
+python:
+  - '2.7'
+  - '3.4'
+  - '3.5'
+  - '3.6'
+  - '3.7'
+# TODO (dargueta): Enable these once we figure out FTP timing issues in PyPy tests
+#  - 'pypy'
+#  - 'pypy3.5-7.0'
+
 matrix:
   include:
-    - python: "2.7"
-      env:
-        - SETUPTOOLS=setuptools PIP=pip
-    - python: "3.7"
-      env:
-        - SETUPTOOLS=setuptools PIP=pip
-      dist: xenial
-      sudo: true
-      install:
-        - pip install mypy
-        - make typecheck
-    - python: "3.6"
-      install:
-        - pip install mypy
-        - make typecheck
-      env:
-        - SETUPTOOLS=setuptools PIP=pip
-    - python: "3.5"
-      env:
-        - SETUPTOOLS=setuptools PIP=pip
-    - python: "3.4"
-      env:
-        - SETUPTOOLS=setuptools PIP=pip
+    - name: 'Type checking'
+      python: '3.7'
+      env: TOXENV=typecheck
 
 before_install:
-  - pip install $SETUPTOOLS $PIP -U
+  - pip install -U tox tox-travis
   - pip --version
   - pip install -r testrequirements.txt
   - pip freeze
@@ -40,5 +31,4 @@ after_success:
   - coveralls
 
 # command to run tests
-script:
-  - nosetests -v --with-coverage --cover-package=fs tests
+script: tox

CHANGELOG.md

@@ -12,6 +12,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fixed tests leaving tmp files
 - Fixed typing issues
 - Fixed link namespace returning bytes
+- Fixed abstract class import from `collections` which would break on Python 3.8
+- Fixed incorrect imports of `mock` on Python 3
+- Removed some unused imports and unused `requirements.txt` file
+- Added mypy checks to Travis
+
+### Changed
+
+Entire test suite has been migrated to [pytest](https://docs.pytest.org/en/latest/).
+Closes [#327](https://github.com/PyFilesystem/pyfilesystem2/issues/327).
 
 ## [2.4.10] - 2019-07-29
 

appveyor.yml

@@ -20,10 +20,10 @@ environment:
 
 install:
   # We need wheel installed to build wheels
-  - "%PYTHON%\\python.exe -m pip install nose psutil pyftpdlib mock"
+  - "%PYTHON%\\python.exe -m pip install pytest pytest-randomly pytest-cov psutil pyftpdlib mock"
   - "%PYTHON%\\python.exe setup.py install"
 
 build: off
 
 test_script:
-  - "%PYTHON%\\python.exe -m nose tests -v"
+  - "%PYTHON%\\python.exe -m pytest -v tests"

docs/source/implementers.rst

@@ -54,6 +54,13 @@ You may also want to override some of the methods in the test suite for more tar
 .. autoclass:: fs.test.FSTestCases
     :members:
 
+.. note::
+
+    As of version 2.4.11 this project uses `pytest <https://pytest.org/en/latest/>`_ to run its tests.
+    While it's completely compatible with ``unittest``-style tests, it's much more powerful and
+    feature-rich. We suggest you take advantage of it and its plugins in new tests you write, rather
+    than sticking to strict ``unittest`` features. For benefits and limitations, see `here <https://pytest.org/en/latest/unittest.html>`_.
+
 
 .. _essential-methods:
 

fs/error_tools.py

@@ -8,7 +8,6 @@
 import errno
 import platform
 import sys
-import typing
 from contextlib import contextmanager
 
 from six import reraise, PY3
@@ -116,4 +115,4 @@ def unwrap_errors(path_replace):
                 e.path = path_replace.get(e.path, e.path)
             else:
                 e.path = path_replace
-        reraise(type(e), e)
+        raise

fs/test.py

@@ -8,7 +8,6 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import collections
 from datetime import datetime
 import io
 import itertools
@@ -17,6 +16,8 @@
 import os
 import time
 
+import pytest
+
 import fs.copy
 import fs.move
 from fs import ResourceType, Seek
@@ -30,6 +31,11 @@
 import six
 from six import text_type
 
+if six.PY2:
+    import collections as collections_abc
+else:
+    import collections.abc as collections_abc
+
 
 UNICODE_TEXT = """
 
@@ -1285,7 +1291,7 @@ def test_scandir(self):
 
         # Check scandir returns an iterable
         iter_scandir = self.fs.scandir("/")
-        self.assertTrue(isinstance(iter_scandir, collections.Iterable))
+        self.assertTrue(isinstance(iter_scandir, collections_abc.Iterable))
         self.assertEqual(list(iter_scandir), [])
 
         # Check scanning
@@ -1298,7 +1304,7 @@ def test_scandir(self):
         self.fs.create("bar")
         self.fs.makedir("dir")
         iter_scandir = self.fs.scandir("/")
-        self.assertTrue(isinstance(iter_scandir, collections.Iterable))
+        self.assertTrue(isinstance(iter_scandir, collections_abc.Iterable))
 
         scandir = sorted(
             [r.raw for r in iter_scandir], key=lambda info: info["basic"]["name"]
@@ -1790,7 +1796,7 @@ def test_tree(self):
 
     def test_unicode_path(self):
         if not self.fs.getmeta().get("unicode_paths", False):
-            self.skipTest("the filesystem does not support unicode paths.")
+            return pytest.skip("the filesystem does not support unicode paths.")
 
         self.fs.makedir("földér")
         self.fs.writetext("☭.txt", "Smells like communism.")
@@ -1813,10 +1819,10 @@ def test_unicode_path(self):
     def test_case_sensitive(self):
         meta = self.fs.getmeta()
         if "case_insensitive" not in meta:
-            self.skipTest("case sensitivity not known")
+            return pytest.skip("case sensitivity not known")
 
         if meta.get("case_insensitive", False):
-            self.skipTest("the filesystem is not case sensitive.")
+            return pytest.skip("the filesystem is not case sensitive.")
 
         self.fs.makedir("foo")
         self.fs.makedir("Foo")
@@ -1846,4 +1852,3 @@ def test_hash(self):
             self.assertEqual(
                 foo_fs.hash("hashme.txt", "md5"), "9fff4bb103ab8ce4619064109c54cb9c"
             )
-

fs/walk.py

@@ -12,8 +12,6 @@
 from collections import deque
 from collections import namedtuple
 
-import six
-
 from ._repr import make_repr
 from .errors import FSError
 from .path import abspath
@@ -295,7 +293,7 @@ def _scan(
                 yield info
         except FSError as error:
             if not self.on_error(dir_path, error):
-                six.reraise(type(error), error)
+                raise
 
     def walk(
         self,

requirements.txt

@@ -34,12 +34,18 @@ warn_return_any = false
 disallow_untyped_defs = false
 
 [coverage:run]
+branch = true
 omit = fs/test.py
+source = fs
 
 [coverage:report]
 show_missing = true
+skip_covered = true
 exclude_lines =
     pragma: no cover
     if False:
     @typing.overload
 
+[tool:pytest]
+markers =
+    slow: marks tests as slow (deselect with '-m "not slow"')

setup.cfg

@@ -39,8 +39,6 @@
     package_data={"fs": ["py.typed"]},
     zip_safe=False,
     platforms=["any"],
-    test_suite="nose.collector",
-    tests_require=["appdirs", "mock", "pytz", "pyftpdlib"],
     url="https://github.com/PyFilesystem/pyfilesystem2",
     version=__version__,
 )