From fb520b13022afa5f87b8ad9aa0e56e6ccc480429 Mon Sep 17 00:00:00 2001
From: Jim Rollenhagen <jim@jimrollenhagen.com>
Date: Wed, 30 Sep 2015 07:21:24 -0700
Subject: [PATCH] Move tests/ under ironic_lib/, use ostestr

This moves the tests directory under ironic_lib, which is kind of the
standard around here. Updates tox.ini to point at this directory.

Also updates tox.ini to use ostestr, to be more standard with other
OpenStack things.

Change-Id: I91e6ba38c44a475602175b66c10757ec11b173f9
---
 {tests => ironic_lib/tests}/__init__.py                       | 0
 .../ironic_lib => ironic_lib/tests}/test_disk_partitioner.py  | 0
 {tests/ironic_lib => ironic_lib/tests}/test_disk_utils.py     | 0
 {tests/ironic_lib => ironic_lib/tests}/test_utils.py          | 0
 test-requirements.txt                                         | 2 +-
 tests/ironic_lib/__init__.py                                  | 0
 tox.ini                                                       | 4 ++--
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename {tests => ironic_lib/tests}/__init__.py (100%)
 rename {tests/ironic_lib => ironic_lib/tests}/test_disk_partitioner.py (100%)
 rename {tests/ironic_lib => ironic_lib/tests}/test_disk_utils.py (100%)
 rename {tests/ironic_lib => ironic_lib/tests}/test_utils.py (100%)
 delete mode 100644 tests/ironic_lib/__init__.py

diff --git a/tests/__init__.py b/ironic_lib/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to ironic_lib/tests/__init__.py
diff --git a/tests/ironic_lib/test_disk_partitioner.py b/ironic_lib/tests/test_disk_partitioner.py
similarity index 100%
rename from tests/ironic_lib/test_disk_partitioner.py
rename to ironic_lib/tests/test_disk_partitioner.py
diff --git a/tests/ironic_lib/test_disk_utils.py b/ironic_lib/tests/test_disk_utils.py
similarity index 100%
rename from tests/ironic_lib/test_disk_utils.py
rename to ironic_lib/tests/test_disk_utils.py
diff --git a/tests/ironic_lib/test_utils.py b/ironic_lib/tests/test_utils.py
similarity index 100%
rename from tests/ironic_lib/test_utils.py
rename to ironic_lib/tests/test_utils.py
diff --git a/test-requirements.txt b/test-requirements.txt
index e42aa2c..392154f 100644
--- 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
diff --git a/tests/ironic_lib/__init__.py b/tests/ironic_lib/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tox.ini b/tox.ini
index edde13c..44e9f2f 100644
--- 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