Convert rest of tests to libtmux

Author: tony

tests/__init__.py

@@ -7,3 +7,9 @@
 """
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals, with_statement)
+
+import os
+
+current_dir = os.path.abspath(os.path.dirname(__file__))
+example_dir = os.path.abspath(os.path.join(current_dir, '..', 'examples'))
+fixtures_dir = os.path.realpath(os.path.join(current_dir, 'fixtures'))

tests/test_config.py

@@ -10,10 +10,11 @@
 import kaptan
 import pytest
 
+from libtmux.test import EnvironmentVarGuard
 from tmuxp import config, exc
 
+from . import example_dir
 from .fixtures import config as fixtures
-from .helpers import EnvironmentVarGuard, example_dir
 
 logger = logging.getLogger(__name__)
 TMUXP_DIR = os.path.join(os.path.dirname(__file__), '.tmuxp')

tests/test_server.py

@@ -6,7 +6,7 @@
 
 import logging
 
-from libtmux.server import Server
+from libtmux import Server
 
 logger = logging.getLogger(__name__)
 

tests/test_session.py

@@ -5,11 +5,11 @@
                         unicode_literals, with_statement)
 
 import logging
+
 import pytest
 
 from libtmux import Pane, Session, Window
-
-from .helpers import TEST_SESSION_PREFIX, namer
+from libtmux.test import TEST_SESSION_PREFIX, namer
 
 logger = logging.getLogger(__name__)
 

tests/test_tmuxobject.py

@@ -7,8 +7,7 @@
 import logging
 
 from libtmux import Pane, Session, Window
-
-from .helpers import TEST_SESSION_PREFIX, namer
+from libtmux.test import TEST_SESSION_PREFIX, namer
 
 logger = logging.getLogger(__name__)
 

tests/test_util.py

@@ -21,7 +21,7 @@
 from tmuxp.exc import BeforeLoadScriptError, BeforeLoadScriptNotExists
 from tmuxp.util import run_before_script
 
-from .helpers import fixtures_dir
+from . import fixtures_dir
 
 logger = logging.getLogger(__name__)
 

tests/test_workspacebuilder.py

@@ -12,13 +12,15 @@
 import pytest
 from flaky import flaky
 
+from . import fixtures_dir
 from libtmux import Window
+from libtmux.test import temp_session
 from tmuxp import config, exc
 from tmuxp._compat import text_type
 from tmuxp.workspacebuilder import WorkspaceBuilder
 
+from . import example_dir
 from .fixtures._util import loadfixture
-from .helpers import example_dir, fixtures_dir, temp_session
 
 logger = logging.getLogger(__name__)
 

tests/tests/test_helpers.py

@@ -4,7 +4,7 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals, with_statement)
 
-from ..helpers import get_test_session_name, temp_session
+from libtmux.test import get_test_session_name, temp_session
 
 
 def test_kills_session(server):