From 30e513309fe25af358b4d9ed47da2c7574fc0f06 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 25 Jun 2012 14:00:31 -0500
Subject: 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
---
 tools/test-options  | 1 +
 tools/test-requires | 1 -
 tox.ini             | 7 ++++++-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 tools/test-options

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