cmd simplify, use pytest stderr/stdout management, and use regex instead of fnmatch (#711)

* Python 2.6 support dropped, this line can never be reached
* main args is required, set at entry level
* fix pypy failure
* remove dead code

Author: gaborbernat

tests/conftest.py

@@ -1 +1,3 @@
-from tox._pytestplugin import *  # noqa
+from __future__ import unicode_literals
+
+pytest_plugins = ['tox._pytestplugin']

tests/test_config.py

@@ -1,4 +1,5 @@
 import os
+import re
 import sys
 from textwrap import dedent
 
@@ -2085,18 +2086,16 @@ def test_parse_recreate(self, newconfig):
 
 class TestCmdInvocation:
     def test_help(self, cmd):
-        result = cmd.run("tox", "-h")
+        result = cmd("-h")
         assert not result.ret
-        result.stdout.fnmatch_lines([
-            "*help*"
-        ])
+        assert not result.err
+        assert re.match(r'usage:.*help.*', result.out, re.DOTALL)
 
     def test_version_simple(self, cmd):
-        result = cmd.run("tox", "--version")
+        result = cmd("--version")
         assert not result.ret
-        stdout = result.stdout.str()
-        assert tox.__version__ in stdout
-        assert "imported from" in stdout
+        from tox import __version__
+        assert "{} imported from".format(__version__) in result.out
 
     def test_version_no_plugins(self):
         pm = PluginManager('fakeprject')
@@ -2163,14 +2162,8 @@ def test_listenvs(self, cmd, initproj):
             changedir = docs
             '''
         })
-        result = cmd.run("tox", "-l")
-        result.stdout.fnmatch_lines("""
-            py36
-            py27
-            py34
-            pypy
-            docs
-        """)
+        result = cmd("-l")
+        assert result.outlines == ['py36', 'py27', 'py34', 'pypy', 'docs']
 
     def test_listenvs_verbose_description(self, cmd, initproj):
         initproj('listenvs_verbose_description', filedefs={
@@ -2193,15 +2186,14 @@ def test_listenvs_verbose_description(self, cmd, initproj):
             description = let me overwrite that
             '''
         })
-        result = cmd.run("tox", "-lv")
-        result.stdout.fnmatch_lines("""
-            default environments:
-            py36 -> run pytest on Python 3.6
-            py27 -> run pytest on Python 2.7
-            py34 -> run pytest on Python 3.4
-            pypy -> publish to pypy
-            docs -> let me overwrite that
-        """)
+        result = cmd("-lv")
+        assert result.outlines[2:] == [
+            'default environments:',
+            'py36 -> run pytest on Python 3.6',
+            'py27 -> run pytest on Python 2.7',
+            'py34 -> run pytest on Python 3.4',
+            'pypy -> publish to pypy',
+            'docs -> let me overwrite that']
 
     def test_listenvs_all(self, cmd, initproj):
         initproj('listenvs_all', filedefs={
@@ -2216,15 +2208,8 @@ def test_listenvs_all(self, cmd, initproj):
             changedir = docs
             '''
         })
-        result = cmd.run("tox", "-a")
-        result.stdout.fnmatch_lines("""
-            py36
-            py27
-            py34
-            pypy
-            docs
-            notincluded
-        """)
+        result = cmd("-a")
+        assert result.outlines == ['py36', 'py27', 'py34', 'pypy', 'docs', 'notincluded']
 
     def test_listenvs_all_verbose_description(self, cmd, initproj):
         initproj('listenvs_all_verbose_description', filedefs={
@@ -2241,19 +2226,19 @@ def test_listenvs_all_verbose_description(self, cmd, initproj):
 
             [testenv:docs]
             changedir = docs
-            '''
+            ''',
         })
-        result = cmd.run("tox", "-av")
-        result.stdout.fnmatch_lines("""
-            default environments:
-            py27-windows -> run pytest on Python 2.7 on Windows platform
-            py27-linux   -> run pytest on Python 2.7 on Linux platform
-            py36-windows -> run pytest on Python 3.6 on Windows platform
-            py36-linux   -> run pytest on Python 3.6 on Linux platform
-
-            additional environments:
-            docs         -> generate documentation
-        """)
+        result = cmd("-av")
+        expected = [
+            "default environments:",
+            "py27-windows -> run pytest on Python 2.7 on Windows platform",
+            "py27-linux   -> run pytest on Python 2.7 on Linux platform",
+            "py36-windows -> run pytest on Python 3.6 on Windows platform",
+            "py36-linux   -> run pytest on Python 3.6 on Linux platform",
+            "",
+            "additional environments:",
+            "docs         -> generate documentation"]
+        assert result.outlines[-len(expected):] == expected
 
     def test_listenvs_all_verbose_description_no_additional_environments(self, cmd, initproj):
         initproj('listenvs_all_verbose_description', filedefs={
@@ -2262,29 +2247,25 @@ def test_listenvs_all_verbose_description_no_additional_environments(self, cmd,
             envlist=py27,py36
             '''
         })
-        result = cmd.run("tox", "-av")
-        result.stdout.fnmatch_lines("""
-            default environments:
-            py27 -> [no description]
-            py36 -> [no description]
-        """)
-        assert 'additional environments' not in result.stdout.str()
+        result = cmd("-av")
+        expected = ["default environments:",
+                    "py27 -> [no description]",
+                    "py36 -> [no description]"]
+        assert result.out.splitlines()[-3:] == expected
+        assert 'additional environments' not in result.out
 
     def test_config_specific_ini(self, tmpdir, cmd):
         ini = tmpdir.ensure("hello.ini")
-        result = cmd.run("tox", "-c", ini, "--showconfig")
+        result = cmd("-c", ini, "--showconfig")
         assert not result.ret
-        result.stdout.fnmatch_lines([
-            "*config-file*hello.ini*"
-        ])
+        assert result.outlines[1] == 'config-file: {}'.format(ini)
 
     def test_no_tox_ini(self, cmd, initproj):
-        initproj("noini-0.5")
-        result = cmd.run("tox")
+        initproj("noini-0.5", )
+        result = cmd()
         assert result.ret
-        result.stderr.fnmatch_lines([
-            "*ERROR*tox.ini*not*found*"
-        ])
+        assert result.out == ''
+        assert result.err == "ERROR: toxini file 'tox.ini' not found\n"
 
     def test_override_workdir(self, tmpdir, cmd, initproj):
         baddir = "badworkdir-123"
@@ -2293,13 +2274,12 @@ def test_override_workdir(self, tmpdir, cmd, initproj):
             'tox.ini': '''
             [tox]
             toxworkdir=%s
-            ''' % baddir
+            ''' % baddir,
         })
-        result = cmd.run("tox", "--workdir", gooddir, "--showconfig")
+        result = cmd("--workdir", gooddir, "--showconfig")
         assert not result.ret
-        stdout = result.stdout.str()
-        assert gooddir in stdout
-        assert baddir not in stdout
+        assert gooddir in result.out
+        assert baddir not in result.out
         assert py.path.local(gooddir).check()
         assert not py.path.local(baddir).check()
 
@@ -2312,20 +2292,16 @@ def test_showconfig_with_force_dep_version(self, cmd, initproj):
             deps=
                 dep1==2.3
                 dep2
-            '''
+            ''',
         })
-        result = cmd.run("tox", "--showconfig")
+        result = cmd("--showconfig")
         assert result.ret == 0
-        result.stdout.fnmatch_lines([
-            r'*deps*dep1==2.3, dep2*'
-        ])
+        assert any(re.match(r'.*deps.*dep1==2.3, dep2.*', l) for l in result.outlines)
         # override dep1 specific version, and force version for dep2
-        result = cmd.run("tox", "--showconfig", "--force-dep=dep1",
-                         "--force-dep=dep2==5.0")
+        result = cmd("--showconfig", "--force-dep=dep1",
+                     "--force-dep=dep2==5.0")
         assert result.ret == 0
-        result.stdout.fnmatch_lines([
-            r'*deps*dep1, dep2==5.0*'
-        ])
+        assert any(re.match(r'.*deps.*dep1, dep2==5.0.*', l) for l in result.outlines)
 
     @pytest.mark.xfail(
         "'pypy' not in sys.executable",
@@ -2340,7 +2316,7 @@ def test_colon_symbol_in_directory_name(self, cmd, initproj):
             commands = pip --version
             '''
         })
-        result = cmd.run("tox")
+        result = cmd()
         assert result.ret == 0
 
 

tests/test_interpreters.py

@@ -47,6 +47,7 @@ class proc:
             @staticmethod
             def communicate():
                 return sys.executable.encode(), None
+
         return proc
 
     # Monkeypatch modules to return our faked value
@@ -59,6 +60,7 @@ def test_tox_get_python_executable():
     class envconfig:
         basepython = sys.executable
         envname = "pyxx"
+
     p = tox_get_python_executable(envconfig)
     assert p == py.path.local(sys.executable)
     for ver in "2.7 3.4 3.5 3.6".split():
@@ -86,6 +88,7 @@ def test_find_executable_extra(monkeypatch):
     @staticmethod
     def sysfind(x):
         return "hello"
+
     monkeypatch.setattr(py.path.local, "sysfind", sysfind)
 
     class envconfig:
@@ -122,6 +125,7 @@ def test_get_executable_no_exist(self, interpreters):
         class envconfig:
             basepython = "1lkj23"
             envname = "pyxx"
+
         assert not interpreters.get_executable(envconfig)
         info = interpreters.get_info(envconfig)
         assert not info.version_info
@@ -133,6 +137,7 @@ def test_get_sitepackagesdir_error(self, interpreters):
         class envconfig:
             basepython = sys.executable
             envname = "123"
+
         info = interpreters.get_info(envconfig)
         s = interpreters.get_sitepackagesdir(info, "")
         assert s

tests/test_pytest_plugins.py

@@ -12,10 +12,10 @@
 
 class TestInitProj:
     @pytest.mark.parametrize('kwargs', (
-        {},
-        {'src_root': None},
-        {'src_root': ''},
-        {'src_root': '.'}))
+            {},
+            {'src_root': None},
+            {'src_root': ''},
+            {'src_root': '.'}))
     def test_no_src_root(self, kwargs, tmpdir, initproj):
         initproj('black_knight-42', **kwargs)
         init_file = tmpdir.join('black_knight', 'black_knight', '__init__.py')
@@ -64,14 +64,14 @@ def test_broken_py_path_local_join_workaround_on_Windows(
 
 class TestPathParts:
     @pytest.mark.parametrize('input, expected', (
-        ('', []),
-        ('/', ['/']),
-        ('//', ['//']),
-        ('/a', ['/', 'a']),
-        ('/a/', ['/', 'a']),
-        ('/a/b', ['/', 'a', 'b']),
-        ('a', ['a']),
-        ('a/b', ['a', 'b'])))
+            ('', []),
+            ('/', ['/']),
+            ('//', ['//']),
+            ('/a', ['/', 'a']),
+            ('/a/', ['/', 'a']),
+            ('/a/b', ['/', 'a', 'b']),
+            ('a', ['a']),
+            ('a/b', ['a', 'b'])))
     def test_path_parts(self, input, expected):
         assert _path_parts(input) == expected
 
@@ -82,18 +82,18 @@ def test_on_py_path(self):
 
 
 @pytest.mark.parametrize('base, filedefs, target, expected', (
-    ('/base', {}, '', False),
-    ('/base', {}, '/base', False),
-    ('/base', {'a': {'b': 'data'}}, '', True),
-    ('/base', {'a': {'b': 'data'}}, 'a', True),
-    ('/base', {'a': {'b': 'data'}}, 'a/b', True),
-    ('/base', {'a': {'b': 'data'}}, 'a/x', False),
-    ('/base', {'a': {'b': 'data'}}, 'a/b/c', False),
-    ('/base', {'a': {'b': 'data'}}, '/base', True),
-    ('/base', {'a': {'b': 'data'}}, '/base/a', True),
-    ('/base', {'a': {'b': 'data'}}, '/base/a/b', True),
-    ('/base', {'a': {'b': 'data'}}, '/base/a/x', False),
-    ('/base', {'a': {'b': 'data'}}, '/base/a/b/c', False),
-    ('/base', {'a': {'b': 'data'}}, '/a', False)))
+        ('/base', {}, '', False),
+        ('/base', {}, '/base', False),
+        ('/base', {'a': {'b': 'data'}}, '', True),
+        ('/base', {'a': {'b': 'data'}}, 'a', True),
+        ('/base', {'a': {'b': 'data'}}, 'a/b', True),
+        ('/base', {'a': {'b': 'data'}}, 'a/x', False),
+        ('/base', {'a': {'b': 'data'}}, 'a/b/c', False),
+        ('/base', {'a': {'b': 'data'}}, '/base', True),
+        ('/base', {'a': {'b': 'data'}}, '/base/a', True),
+        ('/base', {'a': {'b': 'data'}}, '/base/a/b', True),
+        ('/base', {'a': {'b': 'data'}}, '/base/a/x', False),
+        ('/base', {'a': {'b': 'data'}}, '/base/a/b/c', False),
+        ('/base', {'a': {'b': 'data'}}, '/a', False)))
 def test_filedefs_contains(base, filedefs, target, expected):
     assert bool(_filedefs_contains(base, filedefs, target)) == expected

tests/test_venv.py

@@ -14,6 +14,7 @@
 from tox.venv import tox_testenv_install_deps
 from tox.venv import VirtualEnv
 
+
 # def test_global_virtualenv(capfd):
 #    v = VirtualEnv()
 #    assert v.list()
@@ -544,7 +545,7 @@ def test_envbindir_path(self, newmocksession, monkeypatch):
         monkeypatch.setenv("PATH", "xyz")
         sysfind_calls = []
         monkeypatch.setattr("py.path.local.sysfind", classmethod(
-                            lambda *args, **kwargs: sysfind_calls.append(kwargs) or 0 / 0))
+            lambda *args, **kwargs: sysfind_calls.append(kwargs) or 0 / 0))
 
         with pytest.raises(ZeroDivisionError):
             venv._install(list('123'), action=action)
@@ -633,7 +634,7 @@ def test_env_variables_added_to_pcall(tmpdir, mocksession, newconfig, monkeypatc
     assert pcalls[0].env["YY"] == "456"
     assert "YY" not in pcalls[1].env
 
-    assert {"ENV_VAR", "VIRTUAL_ENV", "PYTHONHASHSEED", "X123", "PATH"}\
+    assert {"ENV_VAR", "VIRTUAL_ENV", "PYTHONHASHSEED", "X123", "PATH"} \
         .issubset(pcalls[1].env)
 
     # setenv does not trigger PYTHONPATH warnings