Merge pull request #69 from tony/testsuite-refactor

Some tweaks to testsuites.

Author: tony

tmuxp/testsuite/__init__.py

@@ -9,13 +9,17 @@
     with_statement, unicode_literals
 
 import logging
-import unittest
 import sys
 
 from .. import log
 from .._compat import string_types, PY2, reraise
 from ..server import Server
 
+try:
+    import unittest2 as unittest
+except ImportError:  # Python 2.7
+    import unittest
+
 import pkgutil
 
 logger = logging.getLogger()
@@ -91,7 +95,7 @@ def import_string(import_name, silent=False):
                    `None` is returned instead.
     :return: imported object
     """
-    #XXX: py3 review needed
+    # XXX: py3 review needed
     assert isinstance(import_name, string_types)
     # force the import name to automatically convert to strings
     import_name = str(import_name)

tmuxp/testsuite/helpers.py

@@ -29,6 +29,10 @@ class TestCase(unittest.TestCase):
 
     """Base TestClass so we don't have to try: unittest2 every module. """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestCase, cls).setUpClass()  # for python 2.6 unittest2
+
 
 class TmuxTestCase(TestCase):
 
@@ -41,6 +45,7 @@ class TmuxTestCase(TestCase):
 
     def setUp(self):
         """Run bootstrap if :attr:`~.session` is not set."""
+
         if not self.TEST_SESSION_NAME or not self.session:
             self.bootstrap()
 
@@ -95,7 +100,7 @@ def bootstrap(self):
             t.switch_client(session.get('session_id'))
             pass
         except exc.TmuxpException as e:
-            #t.attach_session(session.get('session_id'))
+            # t.attach_session(session.get('session_id'))
             pass
 
         for old_test_session in old_test_sessions:

tmuxp/testsuite/workspacebuilder.py

@@ -303,7 +303,7 @@ def test_automatic_rename_option(self):
             self.session.server._update_windows()
             if w.get('window_name') != 'man':
                 break
-            time.sleep(.2)
+            time.sleep(.1)
 
         self.assertNotEqual(w.get('window_name'), 'man')
 
@@ -314,7 +314,7 @@ def test_automatic_rename_option(self):
             self.session.server._update_windows()
             if w.get('window_name') == 'man':
                 break
-            time.sleep(.25)
+            time.sleep(.1)
 
         self.assertEqual(w.get('window_name'), text_type('man'))
 
@@ -323,7 +323,7 @@ def test_automatic_rename_option(self):
             self.session.server._update_windows()
             if w['window_name'] != 'man':
                 break
-            time.sleep(.25)
+            time.sleep(.1)
 
         self.assertNotEqual(w.get('window_name'), text_type('man'))
 

tmuxp/testsuite/workspacefreezer.py

@@ -49,7 +49,7 @@ class FreezeTest(TmuxTestCase):
     - window_name: test
       panes:
       - shell_command:
-        - htop
+        - top
     """
 
     def test_focus(self):
@@ -64,8 +64,7 @@ def test_freeze_config(self):
         builder.build(session=self.session)
         assert(self.session == builder.session)
 
-        import time
-        time.sleep(1)
+        time.sleep(.50)
 
         session = self.session
         sconf = freeze(session)