Update TestSuite to use base case from helpers. Remove unittest.main() at bottom of files

Author: tony

tmuxp/testsuite/helpers.py

@@ -1,24 +1,27 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, division, print_function, with_statement
+
+import time
+from random import randint
+
 try:
     import unittest2 as unittest
-except ImportError: # Python 2.7
+except ImportError:  # Python 2.7
     import unittest
-import time
 from . import t
-
-from random import randint
 from .. import Server, log, exc
 import logging
 logger = logging.getLogger(__name__)
 
 TEST_SESSION_PREFIX = 'tmuxp_'
 
 
+class TestCase(unittest.TestCase):
 
+    """Base TestClass so we don't have to try: unittest2 every module. """
 
 
-class TmuxTestCase(unittest.TestCase):
+class TmuxTestCase(TestCase):
 
     """TmuxTestCase class, wraps the TestCase in a :class:`Session`."""
 
@@ -28,8 +31,9 @@ class TmuxTestCase(unittest.TestCase):
     TEST_SESSION_NAME = None
 
     def setUp(self):
+        """Run bootstrap if :attr:`~.session` is not set."""
         if not self.TEST_SESSION_NAME or not self.session:
-            self.TEST_SESSION_NAME, self.session = self.bootstrap()
+            self.bootstrap()
 
     def bootstrap(self):
         """Return tuple of the session_name (generated) and :class:`Session`.
@@ -90,4 +94,5 @@ def bootstrap(self):
         assert TEST_SESSION_NAME == session.get('session_name')
         assert TEST_SESSION_NAME != 'tmuxp'
 
-        return (TEST_SESSION_NAME, session)
+        self.TEST_SESSION_NAME = TEST_SESSION_NAME
+        self.session = session

tmuxp/testsuite/test_cli.py

@@ -3,31 +3,28 @@
 
 import os
 import shutil
-try:
-    import unittest2 as unittest
-except ImportError:  # Python 2.7
-    import unittest
 import kaptan
 import tempfile
 from .. import config, cli
 from ..util import tmux
+from .helpers import TestCase
 
 import logging
 
 logger = logging.getLogger(__name__)
 TMUXP_DIR = os.path.join(os.path.dirname(__file__), '.tmuxp')
 
 
-class StartupTest(unittest.TestCase):
+class StartupTest(TestCase):
 
-    '''test startup_cli()'''
+    """test startup_cli()."""
 
     def setUp(self):
         if os.path.isdir(TMUXP_DIR):
             shutil.rmtree(TMUXP_DIR)
 
     def test_creates_config_dir_not_exists(self):
-        '''cli.startup() creates config dir if not exists'''
+        """cli.startup() creates config dir if not exists."""
 
         self.assertFalse(os.path.exists(TMUXP_DIR))
         cli.startup(TMUXP_DIR)
@@ -41,16 +38,16 @@ def tearDownClass(cls):
         logger.debug('wiped %s' % TMUXP_DIR)
 
 
-class FindConfigsTest(unittest.TestCase):
+class FindConfigsTest(TestCase):
 
-    '''test in_dir() test'''
+    """test in_dir() test."""
 
     def setUp(self):
         if os.path.isdir(TMUXP_DIR):
             shutil.rmtree(TMUXP_DIR)
 
     def test_in_dir_from_config_dir(self):
-        '''config.in_dir() finds configs config dir'''
+        """config.in_dir() finds configs config dir."""
 
         cli.startup(TMUXP_DIR)
         config1 = tempfile.NamedTemporaryFile(
@@ -69,7 +66,7 @@ def test_in_dir_from_config_dir(self):
         self.assertEqual(len(configs_found), 2)
 
     def test_in_dir_from_current_dir(self):
-        '''config.in_dir() finds configs config dir'''
+        """config.in_dir() find configs config dir."""
 
         cli.startup(TMUXP_DIR)
         config1 = tempfile.NamedTemporaryFile(
@@ -88,7 +85,7 @@ def test_in_dir_from_current_dir(self):
         self.assertEqual(len(configs_found), 2)
 
     def test_ignore_non_configs_from_current_dir(self):
-        '''cli.in_dir() ignores non-configs from config dir'''
+        """cli.in_dir() ignore non-config from config dir."""
 
         cli.startup(TMUXP_DIR)
         badconfig = tempfile.NamedTemporaryFile(
@@ -107,7 +104,7 @@ def test_ignore_non_configs_from_current_dir(self):
         self.assertEqual(len(configs_found), 1)
 
     def test_get_configs_cwd(self):
-        '''config.in_cwd() finds config in shell's current working directory'''
+        """config.in_cwd() find config in shell current working directory."""
 
         current_dir = os.getcwd()
 
@@ -142,26 +139,34 @@ def tearDownClass(cls):
 sampleconfigdict = {
     'session_name': 'sampleconfig',
     'start_directory': '~',
-    'windows': [{
-        'window_name': 'editor',
-        'panes': [
-            {
-                'start_directory': '~', 'shell_command': ['vim'],
-                },  {
-                'shell_command': ['cowsay "hey"']
-            },
-        ],
-        'layout': 'main-verticle'},
-        {'window_name': 'logging', 'panes': [
-         {'shell_command': ['tail -F /var/log/syslog'],
-          'start_directory':'/var/log'}
-         ]}, {
-             'options': {'automatic_rename': True, },
+    'windows': [
+        {
+            'window_name': 'editor',
             'panes': [
-                {'shell_command': ['htop']}
+                {
+                    'start_directory': '~',
+                    'shell_command': ['vim'],
+                },
+                {
+                    'shell_command': ['cowsay "hey"']
+                },
+            ],
+            'layout': 'main-verticle'
+        },
+        {
+            'window_name': 'logging', 'panes': [
+                {
+                    'shell_command': ['tail -F /var/log/syslog'],
+                    'start_directory':'/var/log'
+                }
             ]
-        }]
+        }, {
+            'options': {'automatic_rename': True, },
+            'panes': [
+                {
+                    'shell_command': ['htop']
+                }
+            ]
+        }
+    ]
 }
-
-if __name__ == '__main__':
-    unittest.main()

tmuxp/testsuite/test_config.py

@@ -3,13 +3,10 @@
 
 import os
 import shutil
-try:
-    import unittest2 as unittest
-except ImportError: # Python 2.7
-    import unittest
 import kaptan
 from .. import config, exc
 from ..util import tmux
+from .helpers import TestCase
 
 import logging
 
@@ -52,7 +49,7 @@
 }
 
 
-class ImportExportTest(unittest.TestCase):
+class ImportExportTest(TestCase):
 
     @classmethod
     def setUpClass(cls):
@@ -132,7 +129,7 @@ def tearDownClass(cls):
         logging.debug('wiped %s' % TMUXP_DIR)
 
 
-class ExpandTest(unittest.TestCase):
+class ExpandTest(TestCase):
 
     """Assume configuration has been imported into a python dict correctly."""
 
@@ -262,7 +259,7 @@ def test_config(self):
         self.assertDictEqual(test_config, self.after_config)
 
 
-class InlineTest(unittest.TestCase):
+class InlineTest(TestCase):
 
     """Tests for :meth:`config.inline()`."""
 
@@ -346,7 +343,7 @@ def test_config(self):
         self.assertDictEqual(test_config, self.after_config)
 
 
-class InheritanceTest(unittest.TestCase):
+class InheritanceTest(TestCase):
     """Test config inheritance for the nested 'start_command'."""
 
     config_before = {
@@ -456,13 +453,13 @@ def test_start_directory(self):
         self.assertDictEqual(config, self.config_after)
 
 
-class ShellCommandBeforeTest(unittest.TestCase):
+class ShellCommandBeforeTest(TestCase):
 
-    '''
+    """
     test config inheritance for the nested 'start_command'
 
     format for tests will be pre
-    '''
+    """
 
     config_unexpanded = {  # shell_command_before is string in some areas
         'session_name': 'sampleconfig',
@@ -630,7 +627,7 @@ def test_shell_command_before(self):
 
 
 
-class TrickleRelativeStartDirectory(unittest.TestCase):
+class TrickleRelativeStartDirectory(TestCase):
     config_expanded = {  # shell_command_before is string in some areas
         'session_name': 'sampleconfig',
         'start_directory': '/var',
@@ -703,9 +700,9 @@ def test_shell_command_before(self):
         self.maxDiff = None
         self.assertDictEqual(test_config, self.config_after)
 
-class ConfigConsistency(unittest.TestCase):
+class ConfigConsistency(TestCase):
 
-    delete_this = '''
+    delete_this = """
     session_name: sampleconfig
     start_directory: '~'
     windows:
@@ -726,10 +723,10 @@ class ConfigConsistency(unittest.TestCase):
     panes:
     - shell_command:
         - htop
-    '''
+    """
 
     def test_no_session_name(self):
-        yaml_config = '''
+        yaml_config = """
         - window_name: editor
           panes:
           shell_command:
@@ -740,7 +737,7 @@ def test_no_session_name(self):
           panes:
           - shell_command:
             - htop
-        '''
+        """
 
         sconfig = kaptan.Kaptan(handler='yaml')
         sconfig = sconfig.import_config(yaml_config).get()
@@ -749,9 +746,9 @@ def test_no_session_name(self):
             config.validate_schema(sconfig)
 
     def test_no_windows(self):
-        yaml_config = '''
+        yaml_config = """
         session_name: test session
-        '''
+        """
 
         sconfig = kaptan.Kaptan(handler='yaml')
         sconfig = sconfig.import_config(yaml_config).get()
@@ -760,7 +757,7 @@ def test_no_windows(self):
             config.validate_schema(sconfig)
 
     def test_no_window_name(self):
-        yaml_config = '''
+        yaml_config = """
         session_name: test session
         windows:
         - window_name: editor
@@ -772,14 +769,10 @@ def test_no_window_name(self):
           panes:
           - shell_command:
             - htop
-        '''
+        """
 
         sconfig = kaptan.Kaptan(handler='yaml')
         sconfig = sconfig.import_config(yaml_config).get()
 
         with self.assertRaisesRegexp(exc.ConfigError, 'missing "window_name"'):
             config.validate_schema(sconfig)
-
-
-if __name__ == '__main__':
-    unittest.main()