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 +0,0 @@
-bandit>=0.10.1

test-requirements-functional.txt

@@ -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

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

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

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]