More test fixes. python 2.6 still having issues.

Author: tony

run_tests.py

@@ -23,8 +23,8 @@
 def main(verbosity=2, failfast=False):
     """Run TestSuite in new tmux session. Exit with code 0 if success."""
 
-    session_name = 'tmuxp'
-    t.tmux('new-session', '-d', '-s', session_name)
+    #session_name = 'tmuxp'
+    #t.tmux('new-session', '-d', '-s', session_name)
     suites = unittest.TestLoader().discover('tmuxp.testsuite', pattern="*.py")
     result = unittest.TextTestRunner(
         verbosity=verbosity, failfast=failfast).run(suites)

tmuxp/testsuite/__init__.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-"""
-    tmuxp.tests
-    ~~~~~~~~~~~
+"""Tests for tmuxp.
+
+tmuxp.tests
+~~~~~~~~~~~
 
-    :copyright: Copyright 2013 Tony Narlock.
-    :license: BSD, see LICENSE for details
+:copyright: Copyright 2013 Tony Narlock.
+:license: BSD, see LICENSE for details
 
 """
 
@@ -30,6 +31,7 @@
 
 
 def suite():
+    """Return TestSuite."""
     try:
         import unittest2 as unittest
     except ImportError:  # Python 2.7

tmuxp/testsuite/helpers.py

@@ -47,9 +47,12 @@ def bootstrap():
     # assert session_list == t.sessions
 
     TEST_SESSION_NAME = TEST_SESSION_PREFIX + str(randint(0, 13370))
-    session = t.new_session(
-        session_name=TEST_SESSION_NAME,
-    )
+    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
@@ -58,7 +61,7 @@ def bootstrap():
     try:
         t.switch_client(session.get('session_id'))
         pass
-    except Exception:
+    except exc.TmuxpException as e:
         #t.attach_session(session.get('session_id'))
         pass
 
@@ -74,35 +77,17 @@ def bootstrap():
 
 class TmuxTestCase(unittest.TestCase):
 
-    '''
-        self.session
-            Session object
-        self.TEST_SESSION_NAME
-            string. name of the test case session.
-    '''
+    """TmuxTestCase class, wraps the TestCase in a :class:`Session`."""
 
-    @classmethod
-    def setUpClass(cls):
-        cls.TEST_SESSION_NAME, cls.session = bootstrap()
+    #: :class:`Session` object.
+    # session = None
+    #: Session name for the TestCase.
+    # TEST_SESSION_NAME = None
 
     @classmethod
-    def setUpClassa(cls):
+    def setUpClass(cls):
+        """Add :attr:`~.TEST_SESSION_NAME` and :attr:`~.session`."""
         try:
-            #t.tmux('kill-server')
-
             cls.TEST_SESSION_NAME, cls.session = bootstrap()
-        # except TmuxNoClientsRunning:
-        #    logger.error('test: TmuxNoClientsRunning')
-        #    cls.TEST_SESSION_NAME, cls.session = bootstrap()
         except Exception as e:
-            import traceback
-            logger.error(e)
-
-            logger.error(traceback.print_exc())
-            # raise exc.TmuxpException(e)
-        return
-
-    @classmethod
-    def tearDownClass(cls):
-        #t.tmux('kill-server')
-        pass
+            raise e