summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Sergeyev <vsergeyev@mirantis.com>2014-11-12 16:06:03 +0200
committerVictor Sergeyev <vsergeyev@mirantis.com>2015-02-12 17:28:54 +0200
commitfa43657e9aa029997d945038a3be5b4f7e7d007f (patch)
tree69246fac392c1a9eca44759748d83a23b150b537
parent2b9d07507695fe04cb5e0ffbda1fa7b9b616aa37 (diff)
downloadoslo-db-fa43657e9aa029997d945038a3be5b4f7e7d007f.tar.gz
Use PyMySQL as DB driver in py3 environment
MySQLDb driver works only with python2.x, so we should use an another connector for work with python3. Used OS_TEST_DBAPI_ADMIN_CONNECTION env variable to set connection strings. Change-Id: I27fbe8f87c713b53a0b1831543a23f7c06fe454b
-rw-r--r--test-requirements-py3.txt4
-rw-r--r--tox.ini6
2 files changed, 7 insertions, 3 deletions
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
index b9c1c33..03670e8 100644
--- a/test-requirements-py3.txt
+++ b/test-requirements-py3.txt
@@ -13,9 +13,7 @@ python-subunit>=0.0.18
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
oslosphinx>=2.2.0 # Apache-2.0
oslotest>=1.2.0 # Apache-2.0
+PyMySQL>=0.6.2 # MIT License
testrepository>=0.0.18
testtools>=0.9.36,!=1.2.0
tempest-lib>=0.2.0
-
-# TODO(harlowja): add in pymysql when able to...
-# https://review.openstack.org/#/c/123737
diff --git a/tox.ini b/tox.ini
index 3d20640..c9d9fb8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,10 +26,16 @@ commands = pip install SQLAlchemy>=0.8.0,<0.9.0
python setup.py testr --slowest --testr-args='{posargs}'
[testenv:py34]
+setenv =
+ {[testenv]setenv}
+ OS_TEST_DBAPI_ADMIN_CONNECTION=mysql+pymysql://openstack_citest:openstack_citest@localhost/;postgresql://openstack_citest:openstack_citest@localhost/postgres;sqlite://
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements-py3.txt
[testenv:py33]
+setenv =
+ {[testenv]setenv}
+ OS_TEST_DBAPI_ADMIN_CONNECTION=mysql+pymysql://openstack_citest:openstack_citest@localhost/;postgresql://openstack_citest:openstack_citest@localhost/postgres;sqlite://
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements-py3.txt