summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-06-28 17:28:40 +0000
committerGerrit Code Review <review@openstack.org>2012-06-28 17:28:40 +0000
commitd9ca0ace90b855841f434e2ddde397c7a10df36d (patch)
tree0fb5e07a0f4599a57006fe575b73ef4fee646fc4
parent6ae0c333aa1a9fe83eea807a90d83b6f466caacf (diff)
parent30e513309fe25af358b4d9ed47da2c7574fc0f06 (diff)
downloadnova-d9ca0ace90b855841f434e2ddde397c7a10df36d.tar.gz
nova-d9ca0ace90b855841f434e2ddde397c7a10df36d.tar.xz
nova-d9ca0ace90b855841f434e2ddde397c7a10df36d.zip
Merge "Add full test environment."
-rw-r--r--tools/test-options1
-rw-r--r--tools/test-requires1
-rw-r--r--tox.ini7
3 files changed, 7 insertions, 2 deletions
diff --git a/tools/test-options b/tools/test-options
new file mode 100644
index 000000000..c7a234740
--- /dev/null
+++ b/tools/test-options
@@ -0,0 +1 @@
+MySQL-python
diff --git a/tools/test-requires b/tools/test-requires
index 35a01dfbb..01cbbe122 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -7,4 +7,3 @@ nose
openstack.nose_plugin>=0.7
pep8==1.2
sphinx>=1.1.2
-MySQL-python
diff --git a/tox.ini b/tox.ini
index a68e37c6f..49d218600 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,6 @@ deps = -r{toxinidir}/tools/pip-requires
commands = nosetests {posargs}
[tox:jenkins]
-sitepackages = True
downloadcache = ~/cache/pip
[testenv:pep8]
@@ -26,3 +25,9 @@ setenv = NOSE_WITH_COVERAGE=1
[testenv:venv]
commands = {posargs}
+
+[testenv:full]
+sitepackages = True
+deps = -r{toxinidir}/tools/pip-requires
+ -r{toxinidir}/tools/test-requires
+ -r{toxinidir}/tools/test-options