Browse Source

use py.test for testing, document it

locally (via tox) and also on travis ci.
Thomas Waldmann 10 years ago
parent
commit
906ea629f6
4 changed files with 11 additions and 5 deletions
  1. 1 1
      .travis.yml
  2. 1 1
      docs/installation.rst
  3. 2 0
      setup.cfg
  4. 7 3
      tox.ini

+ 1 - 1
.travis.yml

@@ -9,4 +9,4 @@ install:
   - "pip install --use-mirrors Cython"
   - "pip install --use-mirrors Cython"
   - "pip install -e ."
   - "pip install -e ."
 # command to run tests
 # command to run tests
-script: fakeroot -u python -m borg.testsuite.run -vb
+script: fakeroot -u py.test

+ 1 - 1
docs/installation.rst

@@ -69,7 +69,7 @@ Some of the steps detailled below might be useful also for non-git installs.
 
 
     # install some dependencies into virtual env
     # install some dependencies into virtual env
     pip install cython  # to compile .pyx -> .c
     pip install cython  # to compile .pyx -> .c
-    pip install tox   # optional, for running unit tests
+    pip install tox pytest  # optional, for running unit tests
     pip install sphinx  # optional, to build the docs
     pip install sphinx  # optional, to build the docs
 
 
     # get |project_name| from github, install it
     # get |project_name| from github, install it

+ 2 - 0
setup.cfg

@@ -0,0 +1,2 @@
+[pytest]
+python_files = testsuite/*.py

+ 7 - 3
tox.ini

@@ -3,9 +3,13 @@ envlist = py32, py33, py34
 
 
 [testenv]
 [testenv]
 # Change dir to avoid import problem
 # Change dir to avoid import problem
-changedir = docs
-commands = {envpython} -m borg.testsuite.run -bv []
+changedir = {envdir}
+deps =
+    pytest
+commands = py.test
 passenv = *  # fakeroot -u needs some env vars
 passenv = *  # fakeroot -u needs some env vars
 
 
 [testenv:py32]
 [testenv:py32]
-deps = mock
+deps =
+    pytest
+    mock