Migrate to testr.

Change-Id: I497fc21a0795b8921f989d7a00b6a73f7730cd22

16 files changed, 14 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index 41564f0..686023c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.pyc
+.testrepository
 .tox/*
 dist/*
 build/*
diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 0000000..8f0b597
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,8 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
+             ${PYTHON:-python} -m subunit.run discover . $LISTOPT $IDOPTION
+
+test_id_option=--load-list $IDFILE
+test_list_option=--list
diff --git a/tests/test_accounts.py b/reddwarfclient/tests/test_accounts.py
index ec76f13..ec76f13 100644
--- a/tests/test_accounts.py
+++ b/reddwarfclient/tests/test_accounts.py
diff --git a/tests/test_auth.py b/reddwarfclient/tests/test_auth.py
index f1c4b59..f1c4b59 100644
--- a/tests/test_auth.py
+++ b/reddwarfclient/tests/test_auth.py
diff --git a/tests/test_base.py b/reddwarfclient/tests/test_base.py
index 5cbd590..5cbd590 100644
--- a/tests/test_base.py
+++ b/reddwarfclient/tests/test_base.py
diff --git a/tests/test_client.py b/reddwarfclient/tests/test_client.py
index d52331f..d52331f 100644
--- a/tests/test_client.py
+++ b/reddwarfclient/tests/test_client.py
diff --git a/tests/test_common.py b/reddwarfclient/tests/test_common.py
index b038a05..b038a05 100644
--- a/tests/test_common.py
+++ b/reddwarfclient/tests/test_common.py
diff --git a/tests/test_instances.py b/reddwarfclient/tests/test_instances.py
index 2131d26..2131d26 100644
--- a/tests/test_instances.py
+++ b/reddwarfclient/tests/test_instances.py
diff --git a/tests/test_limits.py b/reddwarfclient/tests/test_limits.py
index fda182c..fda182c 100644
--- a/tests/test_limits.py
+++ b/reddwarfclient/tests/test_limits.py
diff --git a/tests/test_management.py b/reddwarfclient/tests/test_management.py
index 810961a..810961a 100644
--- a/tests/test_management.py
+++ b/reddwarfclient/tests/test_management.py
diff --git a/tests/test_secgroups.py b/reddwarfclient/tests/test_secgroups.py
index 25b4de8..25b4de8 100644
--- a/tests/test_secgroups.py
+++ b/reddwarfclient/tests/test_secgroups.py
diff --git a/tests/test_users.py b/reddwarfclient/tests/test_users.py
index 80be05f..80be05f 100644
--- a/tests/test_users.py
+++ b/reddwarfclient/tests/test_users.py
diff --git a/tests/test_utils.py b/reddwarfclient/tests/test_utils.py
index c3a000d..c3a000d 100644
--- a/tests/test_utils.py
+++ b/reddwarfclient/tests/test_utils.py
diff --git a/tests/test_xml.py b/reddwarfclient/tests/test_xml.py
index cda382b..cda382b 100644
--- a/tests/test_xml.py
+++ b/reddwarfclient/tests/test_xml.py
diff --git a/test-requirements.txt b/test-requirements.txt
index 16b030a..c1b2eb6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,12 +4,10 @@ pyflakes==0.7.2
 flake8==2.0
 hacking>=0.5.3,<0.6
 
-nose>=1.2.1
-nosexcover>=1.0.7
-openstack.nose_plugin>=0.11
+discover
 sphinx>=1.1.2
-unittest2>=0.5.1
-testtools
+testrepository>=0.0.13
+testtools>=0.9.29
 # This used to be but openstack/requirements is set to [below].
 # If this breaks we 1) fix tests to use [below] or
 # 2) petition to use mock>=1.0.1
diff --git a/tox.ini b/tox.ini
index bbebce7..9332b14 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_OPENSTACK_SHOW_ELAPSED=1
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = nosetests
+commands = python setup.py testr --testr-args='{posargs}'
 
 [testenv:pep8]
 commands = flake8
@@ -21,7 +21,7 @@ commands = flake8
 commands = {posargs}
 
 [testenv:cover]
-commands = nosetests --cover-erase --cover-package=reddwarfclient --with-xcoverage
+commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:docs]
 -deps =