Move tmuxp testsuites to tmuxp namespace, rm relative imp

Author: tony

tmuxp/testsuite/__init__.py

@@ -17,14 +17,14 @@
 except ImportError:  # Python 2.7
     import unittest
 
-from .. import log
-from .._compat import string_types, PY2, reraise
-from ..server import Server
+from tmuxp import log
+from tmuxp._compat import string_types, PY2, reraise
+from tmuxp.server import Server
 
 t = Server()
 t.socket_name = 'tmuxp_test'
 
-from . import helpers
+from tmuxp.testsuite import helpers
 
 
 # Logger functionality

tmuxp/testsuite/cli.py

@@ -15,8 +15,8 @@
 import tempfile
 import unittest
 
-from .helpers import TestCase
-from .. import config, cli
+from tmuxp.testsuite.helpers import TestCase
+from tmuxp import config, cli
 
 logger = logging.getLogger(__name__)
 

tmuxp/testsuite/config.py

@@ -17,9 +17,9 @@
 
 import kaptan
 
-from .helpers import TestCase
-from .util import EnvironmentVarGuard
-from .. import config, exc
+from tmuxp.testsuite.helpers import TestCase
+from tmuxp.testsuite.util import EnvironmentVarGuard
+from tmuxp import config, exc
 
 
 logger = logging.getLogger(__name__)
@@ -1098,6 +1098,7 @@ def test_replaces_start_directory(self):
             self.assertEqual("hi - %s" % env_value, sconfig['session_name'])
             self.assertEqual("logging @ %s" % env_value, sconfig['windows'][1]['window_name'])
 
+
 def suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(ConfigBlankPanes))

tmuxp/testsuite/config_teamocil.py

@@ -15,8 +15,8 @@
 
 import kaptan
 
-from .helpers import TestCase
-from .. import config
+from tmuxp.testsuite.helpers import TestCase
+from tmuxp import config
 
 logger = logging.getLogger(__name__)
 TMUXP_DIR = os.path.join(os.path.dirname(__file__), '.tmuxp')

tmuxp/testsuite/config_tmuxinator.py

@@ -15,8 +15,8 @@
 
 import kaptan
 
-from .helpers import TestCase
-from .. import config
+from tmuxp.testsuite.helpers import TestCase
+from tmuxp import config
 
 logger = logging.getLogger(__name__)
 TMUXP_DIR = os.path.join(os.path.dirname(__file__), '.tmuxp')

tmuxp/testsuite/helpers.py

@@ -14,8 +14,8 @@
 
 from random import randint
 
-from . import t
-from .. import exc
+from tmuxp.testsuite import t
+from tmuxp import exc
 
 logger = logging.getLogger(__name__)
 

tmuxp/testsuite/pane.py

@@ -12,7 +12,7 @@
 import logging
 import unittest
 
-from .helpers import TmuxTestCase
+from tmuxp.testsuite.helpers import TmuxTestCase
 
 logger = logging.getLogger(__name__)
 

tmuxp/testsuite/server.py

@@ -12,9 +12,9 @@
 import logging
 import unittest
 
-from . import t
-from .helpers import TmuxTestCase
-from .. import Server
+from tmuxp.testsuite import t
+from tmuxp.testsuite.helpers import TmuxTestCase
+from tmuxp import Server
 
 logger = logging.getLogger(__name__)
 
@@ -89,7 +89,7 @@ def test_show_environment_not_set(self):
 
 
 def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(ServerTest))
-    suite.addTest(unittest.makeSuite(EnvironmentTest))
-    return suite
+    _suite = unittest.TestSuite()
+    _suite.addTest(unittest.makeSuite(ServerTest))
+    _suite.addTest(unittest.makeSuite(EnvironmentTest))
+    return _suite

tmuxp/testsuite/session.py

@@ -13,9 +13,9 @@
 import unittest
 from random import randint
 
-from . import t
-from .helpers import TmuxTestCase, TEST_SESSION_PREFIX
-from .. import Session, Window, Pane
+from tmuxp.testsuite import t
+from tmuxp.testsuite.helpers import TmuxTestCase, TEST_SESSION_PREFIX
+from tmuxp import Session, Window, Pane
 
 logger = logging.getLogger(__name__)
 

tmuxp/testsuite/test_utils.py

@@ -4,7 +4,7 @@
 from __future__ import absolute_import, division, print_function, \
     with_statement, unicode_literals
 
-from .helpers import get_test_session_name, temp_session, TmuxTestCase, unittest
+from tmuxp.testsuite.helpers import get_test_session_name, temp_session, TmuxTestCase, unittest
 
 
 class TempSession(TmuxTestCase):