convert rest tests to py.test

Author: tony

tests/test_workspacefreezer.py

@@ -12,46 +12,38 @@
 from tmuxp import config
 from tmuxp.workspacebuilder import WorkspaceBuilder, freeze
 
-from .helpers import TmuxTestCase
 from .fixtures._util import loadfixture
 
 logger = logging.getLogger(__name__)
 
 
-class FreezeTest(TmuxTestCase):
-
+def test_freeze_config(session):
     yaml_config = loadfixture("workspacefreezer/sampleconfig.yaml")
-
-    def test_focus(self):
-        # assure the built yaml config has focus
-        pass
-
-    def test_freeze_config(self):
-        sconfig = kaptan.Kaptan(handler='yaml')
-        sconfig = sconfig.import_config(self.yaml_config).get()
-
-        builder = WorkspaceBuilder(sconf=sconfig)
-        builder.build(session=self.session)
-        assert self.session == builder.session
-
-        time.sleep(.50)
-
-        session = self.session
-        sconf = freeze(session)
-
-        config.validate_schema(sconf)
-
-        sconf = config.inline(sconf)
-
-        kaptanconf = kaptan.Kaptan()
-        kaptanconf = kaptanconf.import_config(sconf)
-        kaptanconf.export(
-            'json',
-            indent=2
-        )
-        kaptanconf.export(
-            'yaml',
-            indent=2,
-            default_flow_style=False,
-            safe=True
-        )
+    sconfig = kaptan.Kaptan(handler='yaml')
+    sconfig = sconfig.import_config(yaml_config).get()
+
+    builder = WorkspaceBuilder(sconf=sconfig)
+    builder.build(session=session)
+    assert session == builder.session
+
+    time.sleep(.50)
+
+    session = session
+    sconf = freeze(session)
+
+    config.validate_schema(sconf)
+
+    sconf = config.inline(sconf)
+
+    kaptanconf = kaptan.Kaptan()
+    kaptanconf = kaptanconf.import_config(sconf)
+    kaptanconf.export(
+        'json',
+        indent=2
+    )
+    kaptanconf.export(
+        'yaml',
+        indent=2,
+        default_flow_style=False,
+        safe=True
+    )

tests/tests/test_helpers.py

@@ -4,40 +4,40 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals, with_statement)
 
-from ..helpers import TmuxTestCase, get_test_session_name, temp_session
+from ..helpers import get_test_session_name, temp_session
 
 
-class TempSession(TmuxTestCase):
+def test_kills_session(server):
+    server = server
+    session_name = get_test_session_name(server=server)
 
-    def test_kills_session(self):
-        server = self.server
-        session_name = get_test_session_name(server=server)
+    with temp_session(
+        server=server, session_name=session_name
+    ):
+        result = server.has_session(session_name)
+        assert result
 
-        with temp_session(
-            server=server, session_name=session_name
-        ):
-            result = server.has_session(session_name)
-            assert result
+    assert not server.has_session(session_name)
 
-        assert not server.has_session(session_name)
 
-    def test_if_session_killed_before(self):
-        """Handles situation where session already closed within context"""
+def test_if_session_killed_before(server):
+    """Handles situation where session already closed within context"""
 
-        server = self.server
-        session_name = get_test_session_name(server=server)
+    server = server
+    session_name = get_test_session_name(server=server)
 
-        with temp_session(server=server, session_name=session_name):
+    with temp_session(server=server, session_name=session_name):
 
-            # an error or an exception within a temp_session kills the session
-            server.kill_session(session_name)
+        # an error or an exception within a temp_session kills the session
+        server.kill_session(session_name)
 
-            result = server.has_session(session_name)
-            assert not result
+        result = server.has_session(session_name)
+        assert not result
 
-        # really dead?
-        assert not server.has_session(session_name)
+    # really dead?
+    assert not server.has_session(session_name)
 
-    def test_if_session_name_works(self):
-        """should allow custom ``session_name``."""
-        pass
+
+def test_if_session_name_works(self):
+    """should allow custom ``session_name``."""
+    pass