Local and hosted test unification

fedora-infra · Oct 8, 2016 · d8b41ef · d8b41ef
1 parent 05bd2c9
commit d8b41ef
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,8 @@ python:
 
 install:
  - pip install -e .[commands,consumers]
- - pip install nose mock sqlalchemy unittest2
-script: nosetests -v
+ - pip install nose
+script: python setup.py nosetests
 notifications:
     email: false
     irc:

diff --git a/setup.cfg b/setup.cfg
@@ -1,3 +1,5 @@
 [nosetests]
 
 where=fedmsg/tests
+verbosity=2
+detailed-errors=1
diff --git a/setup.py b/setup.py
@@ -96,6 +96,9 @@
 ))
 tests_require = [
     'nose',
+    'moksha.hub',
+    'pygments',
+    'psutil',
     'sqlalchemy',  # For the persistent-store test(s).
 ]
 

diff --git a/tox.ini b/tox.ini
@@ -3,6 +3,7 @@ envlist = py{27}-six{13,17,19}
 downloadcache = {toxworkdir}/_download/
 
 [testenv]
+recreate = True
 basepython =
     py26: python2.6
     py27: python2.7
@@ -12,8 +13,6 @@ deps =
     six17: six==1.7.3
     six19: six>=1.9.0
     nose
-    mock
-    sqlalchemy
 sitepackages = False
 commands =
-    nosetests {posargs}
+    python setup.py nosetests