Put py34 first in the env order of tox
To solve the problem of "db type could not be determined" on py34 we have to run first the py34 env to, then, run py27. This patch puts py34 first on the tox.ini list of envs to avoid this problem to happen. Change-Id: I9502b0b42ed742d64517be5463e3c5f65eba61c1 Closes-bug: #1604734
This commit is contained in:
parent
94d773b0d5
commit
8a8f19e33e
16
tox.ini
16
tox.ini
|
@ -1,24 +1,24 @@
|
|||
[tox]
|
||||
minversion = 1.8
|
||||
envlist = py{27,34,35},py{27,34,35}-{postgresql,mysql}{,-file,-swift,-ceph},pep8,bashate
|
||||
envlist = py{34,35,27},py{34,35,27}-{postgresql,mysql}{,-file,-swift,-ceph},pep8,bashate
|
||||
|
||||
[testenv]
|
||||
usedevelop = True
|
||||
sitepackages = False
|
||||
passenv = LANG OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE GNOCCHI_TEST_*
|
||||
deps = .[test]
|
||||
py{27,34,35}-postgresql: .[postgresql,swift,ceph,file]
|
||||
py{27,34,35}-mysql: .[mysql,swift,ceph,file]
|
||||
py{34,35,27}-postgresql: .[postgresql,swift,ceph,file]
|
||||
py{34,35,27}-mysql: .[mysql,swift,ceph,file]
|
||||
setenv =
|
||||
GNOCCHI_TEST_STORAGE_DRIVER=file
|
||||
GNOCCHI_TEST_INDEXER_DRIVER=postgresql
|
||||
GNOCCHI_TEST_STORAGE_DRIVERS=file swift ceph
|
||||
GNOCCHI_TEST_INDEXER_DRIVERS=postgresql mysql
|
||||
py{27,34,35}-{postgresql,mysql}-file: GNOCCHI_TEST_STORAGE_DRIVERS=file
|
||||
py{27,34,35}-{postgresql,mysql}-swift: GNOCCHI_TEST_STORAGE_DRIVERS=swift
|
||||
py{27,34,35}-{postgresql,mysql}-ceph: GNOCCHI_TEST_STORAGE_DRIVERS=ceph
|
||||
py{27,34,35}-postgresql{,-file,-swift,-ceph}: GNOCCHI_TEST_INDEXER_DRIVERS=postgresql
|
||||
py{27,34,35}-mysql{,-file,-swift,-ceph}: GNOCCHI_TEST_INDEXER_DRIVERS=mysql
|
||||
py{34,35,27}-{postgresql,mysql}-file: GNOCCHI_TEST_STORAGE_DRIVERS=file
|
||||
py{34,35,27}-{postgresql,mysql}-swift: GNOCCHI_TEST_STORAGE_DRIVERS=swift
|
||||
py{34,35,27}-{postgresql,mysql}-ceph: GNOCCHI_TEST_STORAGE_DRIVERS=ceph
|
||||
py{34,35,27}-postgresql{,-file,-swift,-ceph}: GNOCCHI_TEST_INDEXER_DRIVERS=postgresql
|
||||
py{34,35,27}-mysql{,-file,-swift,-ceph}: GNOCCHI_TEST_INDEXER_DRIVERS=mysql
|
||||
|
||||
commands =
|
||||
doc8 --ignore-path doc/source/rest.rst doc/source
|
||||
|
|
Loading…
Reference in New Issue