Merge "fix more javadocs warnings"

[transportpce.git] / tests / tox.ini

diff --git a/tests/tox.ini b/tests/tox.ini
index 368ca4b90d4d06b855a838678ad449fa19d05ece..e20c076266114636a5a8a8e4689e93cbd3ae51b8 100644 (file)
--- a/tests/tox.ini
+++ b/tests/tox.ini
@@ -3,21 +3,19 @@ envlist = py27
 
 [testenv]
 usedevelop = True
+basepython = python2.7
 deps =
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 whitelist_externals = bash
 commands =
-  bash -c "(cd .. && mvn clean install -DskipTests -Dmaven.javadoc.skip=true)"
-  ./build.sh
-  nosetests --with-xunit transportpce_tests
-
-[testenv:servicehandler]
-usedevelop = True
-deps =
-  -r{toxinidir}/requirements.txt
-  -r{toxinidir}/test-requirements.txt
-whitelist_externals = bash
-commands =
-  bash -c "(cd .. && mvn clean install -DskipTests -Dmaven.javadoc.skip=true)"
-  nosetests --with-xunit transportpce_tests/test_servicehandler.py
+  {py27,portmapping,topology,pce}: bash -c "(cd .. && mvn clean install -DskipTests -Dmaven.javadoc.skip=true)"
+  {py27,portmapping}: ./build.sh
+  {topology,topoPortMapping}: ./buildTesttool.sh
+  #py27: nosetests --with-xunit transportpce_tests/
+  {py27,portmapping}: nosetests --with-xunit transportpce_tests/test_portmapping.py
+  {py27,topoPortMapping}: nosetests --with-xunit transportpce_tests/test_topoPortMapping.py
+  {py27,topology}: nosetests --with-xunit transportpce_tests/test_topology.py
+  {py27,pce}: nosetests --with-xunit transportpce_tests/test_pce.py
+  {py27,servicehandler}: ./SH_func_tests.sh
+  {py27,servicehandler}: nosetests --with-xunit transportpce_tests/test_servicehandler.py