summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2012-06-25 14:00:31 -0500
committerMonty Taylor <mordred@inaugust.com>2012-06-25 14:00:31 -0500
commit30e513309fe25af358b4d9ed47da2c7574fc0f06 (patch)
tree7f4919302463e5af39032e789352e17dcb9d9833
parentaa802e0204f4f3d96b94866ec42478353796c759 (diff)
downloadnova-30e513309fe25af358b4d9ed47da2c7574fc0f06.tar.gz
nova-30e513309fe25af358b4d9ed47da2c7574fc0f06.tar.xz
nova-30e513309fe25af358b4d9ed47da2c7574fc0f06.zip
Add full test environment.
Add a tox environment that will install all of the optional packages and which will run with system site packages enabled so that we pick up those tests as well. This should allow us to run expansive tests on jenkins that aren't normally required locally, but which are possible. Change-Id: Iabd61874061e24950d4d2082a2fba158b4601624
-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 3adddefe6..0e230fcd5 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -7,4 +7,3 @@ nose
openstack.nose_plugin>=0.7
pep8==1.1
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