move more tests (util, workspacebuilder) to py.test func

Author: tony

tests/conftest.py

@@ -20,9 +20,10 @@ def server():
 
 
 @pytest.fixture(scope='function')
-def session(server):
+def session(request, server):
     t = server
     session_name = 'tmuxp'
+
     if not t.has_session(session_name):
         t.cmd('new-session', '-d', '-s', session_name)
 
@@ -61,6 +62,10 @@ def session(server):
     assert TEST_SESSION_NAME == session.get('session_name')
     assert TEST_SESSION_NAME != 'tmuxp'
 
+    def fin():
+        t.kill_server()
+    request.addfinalizer(fin)
+
     return session
 
 

tests/test_util.py

@@ -18,86 +18,84 @@
 from tmuxp.exc import BeforeLoadScriptError, BeforeLoadScriptNotExists
 from tmuxp.util import has_required_tmux_version, run_before_script
 
-from .helpers import TestCase, TmuxTestCase, fixtures_dir, stdouts
+from .helpers import fixtures_dir
 
 logger = logging.getLogger(__name__)
 
 version_regex = re.compile(r'[0-9]\.[0-9]')
 
 
-class TmuxVersionTest(TmuxTestCase):
-
+def test_no_arg_uses_tmux_version():
     """Test the :meth:`has_required_tmux_version`."""
+    result = has_required_tmux_version()
+    assert version_regex.match(result) is not None
 
-    def test_no_arg_uses_tmux_version(self):
-        result = has_required_tmux_version()
-        assert version_regex.match(result) is not None
-
-    def test_ignores_letter_versions(self):
-        """Ignore letters such as 1.8b.
 
-        See ticket https://github.com/tony/tmuxp/issues/55.
+def test_ignores_letter_versions():
+    """Ignore letters such as 1.8b.
 
-        In version 0.1.7 this is adjusted to use LooseVersion, in order to
-        allow letters.
+    See ticket https://github.com/tony/tmuxp/issues/55.
 
-        """
-        result = has_required_tmux_version('1.9a')
-        assert version_regex.match(result) is not None
+    In version 0.1.7 this is adjusted to use LooseVersion, in order to
+    allow letters.
 
-        result = has_required_tmux_version('1.8a')
-        assert result == r'1.8'
+    """
+    result = has_required_tmux_version('1.9a')
+    assert version_regex.match(result) is not None
 
-    def test_error_version_less_1_7(self):
-        with pytest.raises(exc.TmuxpException) as excinfo:
-            has_required_tmux_version('1.7')
-            excinfo.match(r'tmuxp only supports')
+    result = has_required_tmux_version('1.8a')
+    assert result == r'1.8'
 
-        with pytest.raises(exc.TmuxpException) as excinfo:
-            has_required_tmux_version('1.6a')
 
-            excinfo.match(r'tmuxp only supports')
+def test_error_version_less_1_7():
+    with pytest.raises(exc.TmuxpException) as excinfo:
+        has_required_tmux_version('1.7')
+        excinfo.match(r'tmuxp only supports')
 
-        has_required_tmux_version('1.9a')
+    with pytest.raises(exc.TmuxpException) as excinfo:
+        has_required_tmux_version('1.6a')
 
+        excinfo.match(r'tmuxp only supports')
 
-class RunBeforeScript(TestCase):
+    has_required_tmux_version('1.9a')
 
-    def test_raise_BeforeLoadScriptNotExists_if_not_exists(self):
-        script_file = os.path.join(fixtures_dir, 'script_noexists.sh')
 
-        with pytest.raises(BeforeLoadScriptNotExists):
-            run_before_script(script_file)
+def test_raise_BeforeLoadScriptNotExists_if_not_exists():
+    script_file = os.path.join(fixtures_dir, 'script_noexists.sh')
 
-        with pytest.raises(OSError):
-            run_before_script(script_file)
+    with pytest.raises(BeforeLoadScriptNotExists):
+        run_before_script(script_file)
 
-    def test_raise_BeforeLoadScriptError_if_retcode(self):
-        script_file = os.path.join(fixtures_dir, 'script_failed.sh')
+    with pytest.raises(OSError):
+        run_before_script(script_file)
 
-        with pytest.raises(BeforeLoadScriptError):
-            run_before_script(script_file)
 
-    @stdouts
-    def test_return_stdout_if_ok(self, stdout, stderr):
-        script_file = os.path.join(fixtures_dir, 'script_complete.sh')
+def test_raise_BeforeLoadScriptError_if_retcode():
+    script_file = os.path.join(fixtures_dir, 'script_failed.sh')
 
+    with pytest.raises(BeforeLoadScriptError):
         run_before_script(script_file)
-        assert 'hello' in stdout.getvalue()
 
 
-class BeforeLoadScriptErrorTestCase(TestCase):
+def test_return_stdout_if_ok(capsys):
+    script_file = os.path.join(fixtures_dir, 'script_complete.sh')
 
-    def test_returncode(self):
-        script_file = os.path.join(fixtures_dir, 'script_failed.sh')
+    run_before_script(script_file)
+    out, err = capsys.readouterr()
+    assert 'hello' in out
 
-        with pytest.raises(exc.BeforeLoadScriptError) as excinfo:
-            run_before_script(script_file)
-            assert excinfo.match(r'113')
 
-    def test_returns_stderr_messages(self):
-        script_file = os.path.join(fixtures_dir, 'script_failed.sh')
+def test_beforeload_returncode():
+    script_file = os.path.join(fixtures_dir, 'script_failed.sh')
 
-        with pytest.raises(exc.BeforeLoadScriptError) as excinfo:
-            run_before_script(script_file)
-            assert excinfo.match(r'failed with returncode')
+    with pytest.raises(exc.BeforeLoadScriptError) as excinfo:
+        run_before_script(script_file)
+        assert excinfo.match(r'113')
+
+
+def test_beforeload_returns_stderr_messages():
+    script_file = os.path.join(fixtures_dir, 'script_failed.sh')
+
+    with pytest.raises(exc.BeforeLoadScriptError) as excinfo:
+        run_before_script(script_file)
+        assert excinfo.match(r'failed with returncode')