Merge "Move tests/ under ironic_lib/, use ostestr"

2015-10-01 06:04:24 +00:00 · 2015-10-01 06:04:24 +00:00 · 1fc3e0569d
commit 1fc3e0569d
parent 2c7571da1a fb520b1302
7 changed files with 3 additions and 3 deletions
--- a/ironic_lib/tests/init.py
+++ b/ironic_lib/tests/init.py
--- a/ironic_lib/tests/test_disk_partitioner.py
+++ b/ironic_lib/tests/test_disk_partitioner.py
--- a/ironic_lib/tests/test_disk_utils.py
+++ b/ironic_lib/tests/test_disk_utils.py
--- a/ironic_lib/tests/test_utils.py
+++ b/ironic_lib/tests/test_utils.py
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -10,7 +10,7 @@ oslotest>=1.10.0 # Apache-2.0
 pylint==1.4.4 # GNU GPL v2
 simplejson>=2.2.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=1.4.0
 mox3>=0.7.0
+os-testr>=0.1.0
--- a/tests/ironic_lib/init.py
+++ b/tests/ironic_lib/init.py
--- a/tox.ini
+++ b/tox.ini
@ -4,9 +4,9 @@ envlist = py27,py34,pep8
 [testenv]
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
+         TESTS_DIR=./ironic_lib/tests/
 deps = -r{toxinidir}/test-requirements.txt
-commands =
-  python setup.py test --slowest --testr-args='{posargs}'
+commands = ostestr {posargs}

 [flake8]
 show-source = True