diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-04 16:31:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-04 16:31:18 +0000 |
| commit | 0058c6510bfc6c41c830c38f3a30b5347a703478 (patch) | |
| tree | 59d59a7b6dbcb5794cebbd5435ee3be579c74bc8 | |
| parent | 7bfdb6a704855984ae35a1c6ef063782a4f7bf1d (diff) | |
| parent | fa43657e9aa029997d945038a3be5b4f7e7d007f (diff) | |
| download | oslo-db-0058c6510bfc6c41c830c38f3a30b5347a703478.tar.gz | |
Merge "Use PyMySQL as DB driver in py3 environment"
| -rw-r--r-- | test-requirements-py3.txt | 4 | ||||
| -rw-r--r-- | tox.ini | 6 |
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 @@ -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 |