diff options
author | Brant Knudson <bknudson@us.ibm.com> | 2015-01-11 10:40:46 -0600 |
---|---|---|
committer | Brant Knudson <bknudson@us.ibm.com> | 2015-01-16 12:35:59 -0600 |
commit | c07ee616ae1d7e1a212dd17ba1f16a177c7acf3d (patch) | |
tree | 96eac626dd3e47c1cd85f5b2a1a52185ca5a6938 | |
parent | a68636d9bfd1b8388dfcc35e3ba21a2830aae536 (diff) | |
download | keystonemiddleware-c07ee616ae1d7e1a212dd17ba1f16a177c7acf3d.tar.gz |
Add python-memcached to test-requirements
More unit tests run when python-memcached is installed, so add it to
test-requirements.txt.
python-memcached doesn't work on py3k so it can't be in the test
requirements for the python3 jobs.
Closes-Bug: #1411003
Change-Id: I08036c7665421987da9dfd19f6f1e18dc5918f96
-rw-r--r-- | test-requirements-py3.txt | 18 | ||||
-rw-r--r-- | test-requirements.txt | 1 | ||||
-rw-r--r-- | tox.ini | 8 |
3 files changed, 27 insertions, 0 deletions
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt new file mode 100644 index 0000000..778f68a --- /dev/null +++ b/test-requirements-py3.txt @@ -0,0 +1,18 @@ +# 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. + +coverage>=3.6 +discover +fixtures>=0.3.14 +hacking>=0.8.0,<0.9 +mock>=1.0 +pycrypto>=2.6 +oslosphinx>=2.2.0 # Apache-2.0 +oslotest>=1.2.0 # Apache-2.0 +oslo.messaging>=1.4.0,!=1.5.0 +requests-mock>=0.5.1 # Apache-2.0 +sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +testrepository>=0.0.18 +testresources>=0.2.4 +testtools>=0.9.36,!=1.2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 778f68a..5ba9eeb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -16,3 +16,4 @@ sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 testrepository>=0.0.18 testresources>=0.2.4 testtools>=0.9.36,!=1.2.0 +python-memcached>=1.48 @@ -14,6 +14,14 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = python setup.py testr --testr-args='{posargs}' +[testenv:py33] +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements-py3.txt + +[testenv:py34] +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements-py3.txt + [testenv:pep8] commands = flake8 |