diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2018-11-23 02:26:21 -0600 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2018-11-23 02:26:21 -0600 |
commit | 19fc8ae86db7818376f5a9d11359c5f69e8dd747 (patch) | |
tree | 2f1bd526c5cfa32d8b0b5ebf0d7275508404d8fb | |
parent | 7ce80a835f0bc0b75091d1a937a9cfd7c5255821 (diff) | |
download | cherrypy-git-19fc8ae86db7818376f5a9d11359c5f69e8dd747.tar.gz |
Fix test failures on pytest 4v17.4.1
-rw-r--r-- | cherrypy/test/test_static.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cherrypy/test/test_static.py b/cherrypy/test/test_static.py index 5dc5a144..52f4006f 100644 --- a/cherrypy/test/test_static.py +++ b/cherrypy/test/test_static.py @@ -21,6 +21,10 @@ from cherrypy.test import helper @pytest.fixture def unicode_filesystem(tmpdir): + _check_unicode_filesystem(tmpdir) + + +def _check_unicode_filesystem(tmpdir): filename = tmpdir / ntou('☃', 'utf-8') tmpl = 'File system encoding ({encoding}) cannot support unicode filenames' msg = tmpl.format(encoding=sys.getfilesystemencoding()) @@ -37,7 +41,7 @@ def ensure_unicode_filesystem(): """ tmpdir = py.path.local(tempfile.mkdtemp()) try: - unicode_filesystem(tmpdir) + _check_unicode_filesystem(tmpdir) finally: tmpdir.remove() |