Outsource tests scripts not in envlist

Gnpy and nbinotifications tests requires docker and cannot be run
easily in the gate.
For this reason, they are not listed in tox.ini envlist.
Moving them to a separate folder will ease tests management in the gate.

JIRA: TRNSPRTPCE-482
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I57b69bc3c4482c4ef2ed9d0aaeffd874b9925deb

diff --git a/tests/transportpce_tests/with_docker/__init__.py b/tests/transportpce_tests/with_docker/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/transportpce_tests/1.2.1/test_gnpy.py b/tests/transportpce_tests/with_docker/test_gnpy.py
similarity index 100%
rename from tests/transportpce_tests/1.2.1/test_gnpy.py
rename to tests/transportpce_tests/with_docker/test_gnpy.py

diff --git a/tests/transportpce_tests/2.2.1/test_nbinotifications.py b/tests/transportpce_tests/with_docker/test_nbinotifications.py
similarity index 100%
rename from tests/transportpce_tests/2.2.1/test_nbinotifications.py
rename to tests/transportpce_tests/with_docker/test_nbinotifications.py

diff --git a/tox.ini b/tox.ini
index e72d0a7c63e280ce362330dd91bbd88159f3ab66..fba3315685d910b4caf8eb8bc84d1a2a99534e59 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -106,7 +106,7 @@ whitelist_externals = sh
 commands =
   #sudo docker pull atriki/gnpyrest:v1.2
   sudo docker run -d -p 8008:5000 --name gnpy_tpce_rest1 atriki/gnpyrest:v1.2
-  nosetests --with-xunit transportpce_tests/1.2.1/test_gnpy.py
+  nosetests --with-xunit transportpce_tests/with_docker/test_gnpy.py
   sudo docker container rm -f gnpy_tpce_rest1
 
 [testenv:nbinotifications]
@@ -115,7 +115,7 @@ whitelist_externals = sh
                       sudo
 commands =
   sudo docker-compose -f ./nbinotifications/docker-compose.yml up -d
-  nosetests --with-xunit transportpce_tests/2.2.1/test_nbinotifications.py
+  nosetests --with-xunit transportpce_tests/with_docker/test_nbinotifications.py
   sudo docker-compose -f ./nbinotifications/docker-compose.yml down --rmi all
 
 [testenv:docs]