Refactor tests structure for py.test, optimize helper imports

requirements/test.txt

@@ -0,0 +1 @@
+pytest==2.9.1

setup.py

@@ -9,14 +9,17 @@
 import sys
 
 from setuptools import setup
+from setuptools.command.test import test as TestCommand
 
 about = {}
 with open("tmuxp/__about__.py") as fp:
     exec(fp.read(), about)
 
 with open('requirements/base.txt') as f:
     install_reqs = [line for line in f.read().split('\n') if line]
-    tests_reqs = []
+
+with open('requirements/test.txt') as f:
+    tests_reqs = [line for line in f.read().split('\n') if line]
 
 if sys.version_info < (2, 7):
     install_reqs += ['argparse']
@@ -29,6 +32,20 @@
 
 history = open('CHANGES').read().replace('.. :changelog:', '')
 
+
+class PyTest(TestCommand):
+    user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
+
+    def initialize_options(self):
+        TestCommand.initialize_options(self)
+        self.pytest_args = []
+
+    def run_tests(self):
+        import pytest
+        errno = pytest.main(self.pytest_args)
+        sys.exit(errno)
+
+
 setup(
     name=about['__title__'],
     version=about['__version__'],
@@ -39,11 +56,11 @@
     author_email=about['__email__'],
     description=about['__description__'],
     long_description=readme,
-    packages=['tmuxp', 'tmuxp.testsuite'],
+    packages=['tmuxp'],
     include_package_data=True,
     install_requires=install_reqs,
     tests_require=tests_reqs,
-    test_suite='tmuxp.testsuite',
+	cmdclass = {'test': PyTest},
     zip_safe=False,
     keywords=about['__title__'],
     scripts=['pkg/tmuxp.bash', 'pkg/tmuxp.zsh', 'pkg/tmuxp.tcsh'],

tests/__init__.py

@@ -24,7 +24,7 @@
 t = Server()
 t.socket_name = 'tmuxp_test'
 
-from tmuxp.testsuite import helpers  # NOQA
+from . import helpers  # NOQA
 
 logger = logging.getLogger()  # Logger functionality
 

tests/helpers.py

@@ -19,7 +19,7 @@
 from contextlib import contextmanager
 
 from tmuxp import exc
-from tmuxp.testsuite import t
+from . import t
 
 if sys.version_info < (2, 7):
     import unittest2 as unittest
@@ -31,6 +31,9 @@
 TEST_SESSION_PREFIX = 'test tmuxp_'
 
 namer = tempfile._RandomNameSequence()
+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'))
 
 
 def get_test_session_name(server, prefix=TEST_SESSION_PREFIX):
@@ -365,3 +368,39 @@ def test_foo(self):
         sys.stderr = prev_err
         sys.__stdout__ = prev_rout
         sys.__stderr__ = prev_rerr
+
+
+
+class EnvironmentVarGuard(object):
+
+    """Class to help protect the environment variable properly.  Can be used as
+    a context manager.
+      Vendorize to fix issue with Anaconda Python 2 not
+      including test module, see #121.
+    """
+
+    def __init__(self):
+        self._environ = os.environ
+        self._unset = set()
+        self._reset = dict()
+
+    def set(self, envvar, value):
+        if envvar not in self._environ:
+            self._unset.add(envvar)
+        else:
+            self._reset[envvar] = self._environ[envvar]
+        self._environ[envvar] = value
+
+    def unset(self, envvar):
+        if envvar in self._environ:
+            self._reset[envvar] = self._environ[envvar]
+            del self._environ[envvar]
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *ignore_exc):
+        for envvar, value in self._reset.items():
+            self._environ[envvar] = value
+        for unset in self._unset:
+            del self._environ[unset]

tests/test_cli.py

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

tests/test_config.py

@@ -18,15 +18,10 @@
 import kaptan
 
 from tmuxp import config, exc
-from tmuxp.testsuite.helpers import TestCase
-from tmuxp.testsuite.util import EnvironmentVarGuard
+from .helpers import TestCase, EnvironmentVarGuard, example_dir
 
 logger = logging.getLogger(__name__)
 TMUXP_DIR = os.path.join(os.path.dirname(__file__), '.tmuxp')
-current_dir = os.path.abspath(os.path.dirname(__file__))
-example_dir = os.path.abspath(os.path.join(
-    current_dir, '..', '..', 'examples'))
-
 
 sampleconfigdict = {
     'session_name': 'sampleconfig',

tests/test_config_teamocil.py

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

tests/test_config_tmuxinator.py

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

tests/test_pane.py

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

tests/test_server.py

@@ -13,8 +13,8 @@
 import unittest
 
 from tmuxp import Server
-from tmuxp.testsuite import t
-from tmuxp.testsuite.helpers import TmuxTestCase
+from . import t
+from .helpers import TmuxTestCase
 
 logger = logging.getLogger(__name__)
 

tests/test_session.py

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

tests/test_tmuxobject.py

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

tests/test_util.py

@@ -15,49 +15,11 @@
 
 from tmuxp import exc
 from tmuxp.exc import BeforeLoadScriptError, BeforeLoadScriptNotExists
-from tmuxp.testsuite.helpers import TestCase, TmuxTestCase, stdouts
+from .helpers import TestCase, TmuxTestCase, stdouts, fixtures_dir
 from tmuxp.util import has_required_tmux_version, run_before_script
 
 logger = logging.getLogger(__name__)
 
-current_dir = os.path.realpath(os.path.dirname(__file__))
-fixtures_dir = os.path.realpath(os.path.join(current_dir, 'fixtures'))
-
-
-class EnvironmentVarGuard(object):
-
-    """Class to help protect the environment variable properly.  Can be used as
-    a context manager.
-      Vendorize to fix issue with Anaconda Python 2 not
-      including test module, see #121.
-    """
-
-    def __init__(self):
-        self._environ = os.environ
-        self._unset = set()
-        self._reset = dict()
-
-    def set(self, envvar, value):
-        if envvar not in self._environ:
-            self._unset.add(envvar)
-        else:
-            self._reset[envvar] = self._environ[envvar]
-        self._environ[envvar] = value
-
-    def unset(self, envvar):
-        if envvar in self._environ:
-            self._reset[envvar] = self._environ[envvar]
-            del self._environ[envvar]
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *ignore_exc):
-        for envvar, value in self._reset.items():
-            self._environ[envvar] = value
-        for unset in self._unset:
-            del self._environ[unset]
-
 
 class TmuxVersionTest(TmuxTestCase):
 

tests/test_utils.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-"""Tests for tmuxp testsuite's helper and utility functions."""
+"""Tests for .'s helper and utility functions."""
 
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals, with_statement)
 
-from tmuxp.testsuite.helpers import (TmuxTestCase, get_test_session_name,
+from .helpers import (TmuxTestCase, get_test_session_name,
                                      temp_session, unittest)
 
 

tests/test_window.py

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

tests/test_workspacebuilder.py

@@ -19,17 +19,11 @@
 
 from tmuxp import Window, config, exc
 from tmuxp._compat import text_type
-from tmuxp.testsuite.helpers import TmuxTestCase, mute
+from .helpers import TmuxTestCase, mute, current_dir, example_dir, fixtures_dir
 from tmuxp.workspacebuilder import WorkspaceBuilder
 
 logger = logging.getLogger(__name__)
 
-current_dir = os.path.realpath(os.path.dirname(__file__))
-example_dir = os.path.realpath(
-    os.path.join(current_dir, '..', '..', 'examples')
-)
-fixtures_dir = os.path.realpath(os.path.join(current_dir, 'fixtures'))
-
 
 class TwoPaneTest(TmuxTestCase):
 

tests/test_workspacefreezer.py

@@ -17,14 +17,11 @@
 import kaptan
 
 from tmuxp import config
-from tmuxp.testsuite.helpers import TmuxTestCase
+from .helpers import TmuxTestCase, current_dir
 from tmuxp.workspacebuilder import WorkspaceBuilder, freeze
 
 logger = logging.getLogger(__name__)
 
-current_dir = os.path.abspath(os.path.dirname(__file__))
-example_dir = os.path.abspath(os.path.join(current_dir, '..', '..'))
-
 
 class FreezeTest(TmuxTestCase):