summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAngus Salkeld <asalkeld@redhat.com>2013-05-18 18:06:38 +1000
committerAngus Salkeld <asalkeld@redhat.com>2013-05-18 18:06:38 +1000
commit1a723a05c74361d8fe52220061b0697de8003221 (patch)
treeebf1aad97f5adb327bbdb40ed8d70614acd1e6dd /tools
parent6693c9fb04722de9b911fd51a708d70158760178 (diff)
downloadceilometer-1a723a05c74361d8fe52220061b0697de8003221.tar.gz
Replace nose with testr
- add .testr.conf (in base dir and nova_tests) - remove all references to nose - adjust paths: A couple of tests would assume the current directory was ./tests/ but it is now ./ - don't run the tests in parallel as the db tests have one connection per test class. nova_tests hackery: It seems testtools/testr imports everything and I just don't see a way of running things in tests/ and nova_tests/ seperately but in one .test.conf. So if you want to use testr directly you will need to: testr run cd nova_tests testr run part of bug 1177924 Change-Id: I41875dcf94463fa5f9c07a7840c37089226c59ad
Diffstat (limited to 'tools')
-rwxr-xr-xtools/init_testr_if_needed.sh8
-rw-r--r--tools/test-requires5
2 files changed, 12 insertions, 1 deletions
diff --git a/tools/init_testr_if_needed.sh b/tools/init_testr_if_needed.sh
new file mode 100755
index 00000000..9d1e22f9
--- /dev/null
+++ b/tools/init_testr_if_needed.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+# this is rather stupid script is needed as testr init
+# complains if there is already a repo.
+if [ -d nova_tests/.testrepository ]
+then
+ exit 0
+fi
+testr init -d nova_tests
diff --git a/tools/test-requires b/tools/test-requires
index 47dfc659..4709eb77 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -1,5 +1,6 @@
-nose
+distribute>=0.6.24
coverage
+discover
mock
mox
fixtures>=0.3.12
@@ -17,4 +18,6 @@ netifaces
sphinx
docutils==0.9.1 # for bug 1091333, remove after sphinx >1.1.3 is released.
python-spidermonkey
+python-subunit
+testrepository>=0.0.13
testtools>=0.9.29