summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorJeremy Stanley <fungi@yuggoth.org>2015-07-03 23:06:13 +0000
committerJeremy Stanley <fungi@yuggoth.org>2015-07-03 23:06:13 +0000
commit5a6a30c4348e33a02d84f9d4af31c4b8f38c885f (patch)
tree4b5f9a5bbfcef17bbed5936557dcddcf79adcc5f /tox.ini
parentc541dff0895653e8d5e94c15cab0b8b20a6dbc2a (diff)
downloadnova-5a6a30c4348e33a02d84f9d4af31c4b8f38c885f.tar.gz
Remove unneeded OS_TEST_DBAPI_ADMIN_CONNECTION
The desired OS_TEST_DBAPI_ADMIN_CONNECTION string is now reflected in the oslo.db 1.12.0 release's default behavior, and so does not need to be set any longer to achieve the same opportunistic backend discovery for tests. Change-Id: I1af372f6f18038e8fc63076b4e399d0ae86f5a23
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini9
1 files changed, 1 insertions, 8 deletions
diff --git a/tox.ini b/tox.ini
index 5e55830aeb..bdd857a898 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,14 +30,7 @@ commands =
flake8 {posargs}
[testenv:py34]
-# NOTE(viktors): we must change default connection string for MySQL because
-# we use a different DB connector (PyMySQL, not MySQLdb) in py3x
-# env. So we should put new DB URLs in the env variable. This
-# will allow to run tests, that require MySQL database,
-# for example DB migration tests.
-setenv =
- {[testenv]setenv}
- OS_TEST_DBAPI_ADMIN_CONNECTION=mysql+pymysql://openstack_citest:openstack_citest@localhost/;postgresql://openstack_citest:openstack_citest@localhost/postgres;sqlite://
+setenv = {[testenv]setenv}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =