From 6e9f3bb10a105411b0eb3e8f22a252af0784cb0b Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Wed, 26 Sep 2012 17:09:10 -0700
Subject: Revert "Add full test environment."

This reverts commit 30e513309fe25af358b4d9ed47da2c7574fc0f06.

The python mysql module was removed from test-requires in favor
of test-options, but the work to actually use that was never
completed.  Revert the change so that mysql testing is actually
performed again.

Change-Id: Iaf35811cc748272229260f2dab95520995a69b44
---
 tools/test-options  | 1 -
 tools/test-requires | 1 +
 tox.ini             | 7 +------
 3 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 tools/test-options

diff --git a/tools/test-options b/tools/test-options
deleted file mode 100644
index c7a234740..000000000
--- a/tools/test-options
+++ /dev/null
@@ -1 +0,0 @@
-MySQL-python
diff --git a/tools/test-requires b/tools/test-requires
index 5592cada8..74910be0d 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -12,3 +12,4 @@ pylint==0.25.2
 sphinx>=1.1.2
 feedparser
 python-cinderclient
+MySQL-python
diff --git a/tox.ini b/tox.ini
index 4212d05ce..dc46b5fb4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,6 +18,7 @@ deps = -r{toxinidir}/tools/pip-requires
 commands = nosetests {posargs}
 
 [tox:jenkins]
+sitepackages = True
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
@@ -37,9 +38,3 @@ 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