Move testsuite bootstrap into TmuxTestCase, try travis now

Author: tony

tmuxp/testsuite/helpers.py

@@ -15,9 +15,24 @@
 TEST_SESSION_PREFIX = 'tmuxp_'
 
 
-def bootstrap():
-    '''
-        Returns a tuple of the session_name (generated) and a :class:`Session`
+
+
+
+class TmuxTestCase(unittest.TestCase):
+
+    """TmuxTestCase class, wraps the TestCase in a :class:`Session`."""
+
+    #: :class:`Session` object.
+    session = None
+    #: Session name for the TestCase.
+    TEST_SESSION_NAME = None
+
+    def setUp(self):
+        if not self.TEST_SESSION_NAME or not self.session:
+            self.TEST_SESSION_NAME, self.session = self.bootstrap()
+
+    def bootstrap(self):
+        """Return tuple of the session_name (generated) and :class:`Session`.
 
         Checks to verify if the user has a tmux client open.
 
@@ -28,66 +43,51 @@ def bootstrap():
         if there is no other client open aside from a tmuxp_ prefixed session
         a dumby session will be made to prevent tmux from closing.
 
-    '''
-
-    session_name = 'tmuxp'
-    if not t.has_session(session_name):
-        t.tmux('new-session', '-d', '-s', session_name)
-
-    # find current sessions prefixed with tmuxp
-    old_test_sessions = [s.get('session_name') for s in t._sessions
-                        if
-                        s.get('session_name').startswith(TEST_SESSION_PREFIX)]
-
-    other_sessions = [s.get('session_name') for s in t._sessions
-                      if not s.get('session_name').startswith(
-                          TEST_SESSION_PREFIX
-                      )]
-
-    # assert session_list == t.sessions
-
-    TEST_SESSION_NAME = TEST_SESSION_PREFIX + str(randint(0, 13370))
-    try:
-        session = t.new_session(
-            session_name=TEST_SESSION_NAME,
-        )
-    except exc.TmuxpException as e:
-        raise e
-
-    '''
-    Make sure that tmuxp can :ref:`test_builder_visually` and switches to the
-    newly created session for that testcase.
-    '''
-    try:
-        t.switch_client(session.get('session_id'))
-        pass
-    except exc.TmuxpException as e:
-        #t.attach_session(session.get('session_id'))
-        pass
-
-    for old_test_session in old_test_sessions:
-        logger.debug('Old test test session %s found. Killing it.' %
-                      old_test_session)
-        t.kill_session(old_test_session)
-    assert TEST_SESSION_NAME == session.get('session_name')
-    assert TEST_SESSION_NAME != 'tmuxp'
-
-    return (TEST_SESSION_NAME, session)
+        """
 
+        session_name = 'tmuxp'
+        if not t.has_session(session_name):
+            t.tmux('new-session', '-d', '-s', session_name)
 
-class TmuxTestCase(unittest.TestCase):
+        # find current sessions prefixed with tmuxp
+        old_test_sessions = [
+            s.get('session_name') for s in t._sessions
+            if s.get('session_name').startswith(TEST_SESSION_PREFIX)
+        ]
 
-    """TmuxTestCase class, wraps the TestCase in a :class:`Session`."""
+        other_sessions = [
+            s.get('session_name') for s in t._sessions
+            if not s.get('session_name').startswith(
+                TEST_SESSION_PREFIX
+            )
+        ]
 
-    #: :class:`Session` object.
-    # session = None
-    #: Session name for the TestCase.
-    # TEST_SESSION_NAME = None
+        # assert session_list == t.sessions
 
-    @classmethod
-    def setUpClass(cls):
-        """Add :attr:`~.TEST_SESSION_NAME` and :attr:`~.session`."""
+        TEST_SESSION_NAME = TEST_SESSION_PREFIX + str(randint(0, 13370))
         try:
-            cls.TEST_SESSION_NAME, cls.session = bootstrap()
-        except Exception as e:
+            session = t.new_session(
+                session_name=TEST_SESSION_NAME,
+            )
+        except exc.TmuxpException as e:
             raise e
+
+        '''
+        Make sure that tmuxp can :ref:`test_builder_visually` and switches to the
+        newly created session for that testcase.
+        '''
+        try:
+            t.switch_client(session.get('session_id'))
+            pass
+        except exc.TmuxpException as e:
+            #t.attach_session(session.get('session_id'))
+            pass
+
+        for old_test_session in old_test_sessions:
+            logger.debug('Old test test session %s found. Killing it.' %
+                        old_test_session)
+            t.kill_session(old_test_session)
+        assert TEST_SESSION_NAME == session.get('session_name')
+        assert TEST_SESSION_NAME != 'tmuxp'
+
+        return (TEST_SESSION_NAME, session)