From a167d0b1b0e132a9242f35fd23859d0cfb1fc4e6 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Thu, 4 Jun 2015 07:16:53 +1200 Subject: [PATCH] Consolidate test-requirements files. The bandit and functional files don't add much and aren't updated by update.py, nor are they standard where we'd want to teach update.py about them. Change-Id: Ibf28825a6ed50871b707703366c67f2c15a47b02 --- test-requirements-bandit.txt | 1 - test-requirements-functional.txt | 8 -------- test-requirements-py3.txt | 3 +++ test-requirements.txt | 2 ++ tox.ini | 4 ++-- 5 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 test-requirements-bandit.txt delete mode 100644 test-requirements-functional.txt diff --git a/test-requirements-bandit.txt b/test-requirements-bandit.txt deleted file mode 100644 index b21da7f022..0000000000 --- a/test-requirements-bandit.txt +++ /dev/null @@ -1 +0,0 @@ -bandit>=0.10.1 diff --git a/test-requirements-functional.txt b/test-requirements-functional.txt deleted file mode 100644 index 5a710249a1..0000000000 --- a/test-requirements-functional.txt +++ /dev/null @@ -1,8 +0,0 @@ -# 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. - -python-keystoneclient>=1.3.0 -requests>=2.5.2 -oslotest>=1.5.1 # Apache-2.0 -testrepository>=0.0.18 diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt index a1e956bafa..dbb17fe9fb 100644 --- a/test-requirements-py3.txt +++ b/test-requirements-py3.txt @@ -51,3 +51,6 @@ oslosphinx>=2.5.0 # Apache-2.0 tempest-lib>=0.5.0 +# Functional tests. +python-keystoneclient>=1.3.0 +requests>=2.5.2 diff --git a/test-requirements.txt b/test-requirements.txt index a290d20291..9fd1519a81 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -44,3 +44,5 @@ oslosphinx>=2.5.0 # Apache-2.0 tempest-lib>=0.5.0 +# Security checks +bandit>=0.10.1 diff --git a/tox.ini b/tox.ini index 540cc35ffd..ec5db126ee 100644 --- a/tox.ini +++ b/tox.ini @@ -90,7 +90,7 @@ commands = oslo_debug_helper {posargs} [testenv:functional] basepython = python3.4 -deps = -r{toxinidir}/test-requirements-functional.txt +deps = -r{toxinidir}/test-requirements-py3.txt setenv = OS_TEST_PATH=./keystone/tests/functional commands = python setup.py testr --slowest --testr-args='{posargs}' @@ -112,7 +112,7 @@ commands= commands = oslo-config-generator --config-file=config-generator/keystone.conf [testenv:bandit] -deps = -r{toxinidir}/test-requirements-bandit.txt +deps = -r{toxinidir}/test-requirements.txt commands = bandit -c bandit.yaml -r keystone -n5 -p keystone_conservative [hacking]