diff options
| author | James E. Blair <jeblair@hp.com> | 2012-09-26 17:09:10 -0700 |
|---|---|---|
| committer | James E. Blair <jeblair@hp.com> | 2012-09-28 13:04:53 -0700 |
| commit | 6e9f3bb10a105411b0eb3e8f22a252af0784cb0b (patch) | |
| tree | 56a8b6190e71ada007427fc079fb5607c259e1d4 | |
| parent | 64702669c879dbc5cf27712ef8fadb9fd043664d (diff) | |
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
| -rw-r--r-- | tools/test-options | 1 | ||||
| -rw-r--r-- | tools/test-requires | 1 | ||||
| -rw-r--r-- | tox.ini | 7 |
3 files changed, 2 insertions, 7 deletions
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 @@ -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 |