Merge pull request #151 from tony/pytest

Switch to py.test

Author: tony

.coveragerc

@@ -1,6 +1,6 @@
 [run]
 omit =
-    */testsuite/*
+    test/*
     */_vendor/*
     */_*
     pkg/*

.gitignore

@@ -1,7 +1,8 @@
 *.pyc
 *.pyo
-.venv
-.venv3
+*env*/
+.cache/
+.eggs/
 dist
 *.egg
 *.egg-info

.travis.yml

@@ -16,6 +16,8 @@ env:
   - TMUX_VERSION=1.9a
 before_install:
   - export PIP_USE_MIRRORS=true
+  - pip install --upgrade pytest  # https://github.com/travis-ci/travis-ci/issues/4873
+  - pip install --upgrade pip wheel virtualenv setuptools
   - pip install coveralls
 install:
   - pip install -e .

MANIFEST.in

@@ -1,3 +1,3 @@
-include README.rst LICENSE CHANGES run-tests.py .tmuxp.yaml
+include README.rst LICENSE CHANGES .tmuxp.yaml
 include requirements.pip package_metadata.py
 recursive-include doc *.rst

Makefile

@@ -1,5 +1,5 @@
 test:
-	./run-tests.py
+	py.test
 
 watch_test:
 	if command -v entr > /dev/null; then find . -type f -not -path '*/\.*' | grep -i '.*[.]py' | entr -c make test; else make test; echo "\nInstall entr(1) to automatically run tests on file change.\n See http://entrproject.org/"; fi
@@ -17,7 +17,7 @@ watch_docs:
 	cd doc && $(MAKE) watch_docs
 
 flake8:
-	flake8 tmuxp
+	flake8 tmuxp tests
 
 watch_flake8:
 	if command -v entr > /dev/null; then find . -type f -not -path '*/\.*' | grep -i '.*[.][py]' | entr -c make flake8; else make flake8; echo "\nInstall entr(1) to automatically run tests on file change.\n See http://entrproject.org/"; fi

README.rst

@@ -105,7 +105,7 @@ install dev     .. code-block:: bash
                 more.
 tests           .. code-block:: bash
 
-                    $ python ./run-tests.py
+                    $ make test
 ==============  ==========================================================
 
 .. _BSD: http://opensource.org/licenses/BSD-3-Clause

doc/about.rst

@@ -105,7 +105,6 @@ More details
 
 .. _attempt at 1.7 test: https://travis-ci.org/tony/tmuxp/jobs/12348263
 .. _kaptan: https://github.com/emre/kaptan
-.. _unittest: http://docs.python.org/2/library/unittest.html
 .. _BSD-licensed: http://opensource.org/licenses/BSD-2-Clause
 .. _tmuxinator: https://github.com/aziz/tmuxinator
 .. _teamocil: https://github.com/remiprev/teamocil

doc/developing.rst

@@ -9,12 +9,14 @@ Developing and Testing
 .. todo::
     link to sliderepl or ipython notebook slides
 
-Our tests are inside ``./tmuxp/testsuite``. Tests are implemented using
-:py:mod:`unittest`.
+Our tests are inside ``tests/``. Tests are implemented using
+`pytest`_.
 
-``./run-tests.py`` will create a tmux server on a separate ``socket_name``
+``make test`` will create a tmux server on a separate ``socket_name``
 using ``$ tmux -L test_case``.
 
+.. _pytest: http://pytest.org/
+
 .. _install_dev_env:
 
 Install the latest code from git
@@ -64,7 +66,7 @@ folder with its own packages.
 
 .. code-block:: bash
 
-    $ ./run-tests.py
+    $ make test
 
 You probably didn't see anything but tests scroll by.
 
@@ -76,35 +78,32 @@ If you found a problem or are trying to write a test, you can file an
 Test runner options
 ~~~~~~~~~~~~~~~~~~~
 
-.. note::
-
-    As of v0.1.1, the old way of using ``--tests`` is now deprecated.
-
 Testing specific TestSuites and TestCase.
 
 .. code-block:: bash
 
-    $ ./run-tests.py config
+    $ py.test tests/test_config.py
 
-will test the ``testsuite.config`` :py:class:`unittest.TestSuite`.
+will test the ``tests/test_config.py`` tests.
 
 .. code-block:: bash
 
-    $ ./run-tests.py config.ImportExportTest
+    $ py.test tests/test_config::ImportExportTest
 
-tests ``testsuite.config.ImportExportTest`` :py:class:`unittest.TestCase`.
+tests ``ImportExportTest`` :py:class:`unittest.TestCase` inside of
+``tests/test_config.py``.
 
 individual tests:
 
 .. code-block:: bash
 
-    $ ./run-tests.py config.ImportExportTest.test_export_json
+    $ py.test tests/test_config::ImportExportTest::test_export_Json
 
 Multiple can be separated by spaces:
 
 .. code-block:: bash
 
-    $ ./run-tests.py window pane config.ImportExportTest
+    $ py.test tests/test_{window,pane}.py tests/test_config.py::ImportExportTest::test_export_json
 
 .. _test_builder_visually:
 
@@ -123,7 +122,7 @@ Create two terminals:
 
     .. code-block:: bash
     
-        $ python ./run-tests.py --tests tests_workspacebuilder
+        $ py.test tests/test_workspacebuilder.py
 
 Terminal 1 should have flickered and built the session before your eyes.
 tmuxp hides this building from normal users.
@@ -143,7 +142,7 @@ To run all tests upon editing any ``.py`` file:
 
 .. code-block:: bash
 
-    $ find . -type f -not -path '*/\.*' | grep -i '.*[.]py$' | entr -c ./run-tests.py
+    $ make watch_test
 
 .. _entr: http://entrproject.org/
 
@@ -152,7 +151,7 @@ Rebuild the documentation when an ``.rst`` file is edited:
 .. code-block:: bash
 
    $ cd doc
-   $ find .. -print | grep -i '.*[.]rst' | entr -c make html
+   $ make watch
 
 .. _tmuxp developer config:
 

requirements/test.txt

@@ -0,0 +1,2 @@
+flaky==3.1.1
+pytest==2.9.1