summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--api/.testr.conf3
-rw-r--r--api/test-requirements.txt29
-rw-r--r--api/tox.ini4
-rw-r--r--client/.testr.conf3
-rw-r--r--client/test-requirements.txt24
5 files changed, 57 insertions, 6 deletions
diff --git a/api/.testr.conf b/api/.testr.conf
new file mode 100644
index 0000000..804da37
--- /dev/null
+++ b/api/.testr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_command=${PYTHON:-python} -m unittest discover $LISTOPT
+test_list_option=
diff --git a/api/test-requirements.txt b/api/test-requirements.txt
new file mode 100644
index 0000000..788516f
--- /dev/null
+++ b/api/test-requirements.txt
@@ -0,0 +1,29 @@
+Babel>=1.3
+
+bandit>=0.17.3
+coverage>=3.6
+discover
+fixtures>=0.3.14
+mox3>=0.7.0
+mock>=1.0
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+requests>=2.2.0,!=2.4.0
+testrepository>=0.0.18
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=0.9.36,!=1.2.0
+psutil>=1.1.1,<2.0.0
+oslotest>=1.5.1,<1.6.0 # Apache-2.0
+# Optional packages that should be installed when testing
+PyMySQL!=0.7.7,>=0.6.2 # MIT License
+pysendfile==2.0.0
+qpid-python;python_version=='2.7' # Apache-2.0
+
+# Documentation
+oslosphinx>=2.5.0,<2.6.0 # Apache-2.0
+
+#flake8
+pyflakes!=1.2.0,!=1.2.1,!=1.2.2,<1.4.0,>=0.8.1
+configparser
+mccabe<0.6.0,>=0.5.0
+pycodestyle<2.3.0,>=2.0.0
+flake8
diff --git a/api/tox.ini b/api/tox.ini
index 5b5d52f..df74702 100644
--- a/api/tox.ini
+++ b/api/tox.ini
@@ -9,7 +9,7 @@ usedevelop = True
install_command = pip install -U {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
-commands = lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}'
+commands = python setup.py testr --slowest --testr-args='{posargs}'
whitelist_externals = bash
[tox:jenkins]
@@ -18,8 +18,6 @@ downloadcache = ~/cache/pip
[testenv:pep8]
commands =
flake8 {posargs}
- # Check that .po and .pot files are valid:
- bash -c "find escalator -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
[testenv:cover]
setenv = VIRTUAL_ENV={envdir}
diff --git a/client/.testr.conf b/client/.testr.conf
new file mode 100644
index 0000000..804da37
--- /dev/null
+++ b/client/.testr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_command=${PYTHON:-python} -m unittest discover $LISTOPT
+test_list_option=
diff --git a/client/test-requirements.txt b/client/test-requirements.txt
index 06cb4aa..975488b 100644
--- a/client/test-requirements.txt
+++ b/client/test-requirements.txt
@@ -1,13 +1,31 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-hacking>=0.8.0,<0.9
+# process, which may cause wedges in the gate lbel>=1.3
+bandit>=0.17.3
coverage>=3.6
discover
+fixtures>=0.3.14
mox3>=0.7.0
mock>=1.0
-oslosphinx>=2.2.0 # Apache-2.0
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+requests>=2.2.0,!=2.4.0
testrepository>=0.0.18
+testscenarios>=0.4 # Apache-2.0/BSD
testtools>=0.9.36,!=1.2.0
+psutil>=1.1.1,<2.0.0
+oslotest>=1.5.1,<1.6.0 # Apache-2.0
+# Optional packages that should be installed when testing
+PyMySQL!=0.7.7,>=0.6.2 # MIT License
+pysendfile==2.0.0
+qpid-python;python_version=='2.7' # Apache-2.0
+
+# Documentation
+oslosphinx>=2.5.0,<2.6.0 # Apache-2.0ater.
+
+#flake8
+pyflakes!=1.2.0,!=1.2.1,!=1.2.2,<1.4.0,>=0.8.1
+configparser
+mccabe<0.6.0,>=0.5.0
+pycodestyle<2.3.0,>=2.0.0
+flake8