From 6f880c827b8da14e8099143f25c1d16cf6a63ba8 Mon Sep 17 00:00:00 2001 From: lvdongbing Date: Thu, 22 Jun 2017 15:05:23 +0800 Subject: [PATCH] Remove sqlite_db in set_defaults() Config option sqlite_db was removed from oslo.db[1]. Unit tests will be failed if this argument is set, so we shouldn't set its default value. [1]https://github.com/openstack/oslo.db/commit/cc64f7010522e812a696159009a72e59e2b017a8 Change-Id: I0f84690a538544a76d2ee536e2c6378d91055528 --- bilean/tests/common/utils.py | 4 +--- setup.cfg | 1 - tox.ini | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/bilean/tests/common/utils.py b/bilean/tests/common/utils.py index 77be1ec..0ff0c35 100644 --- a/bilean/tests/common/utils.py +++ b/bilean/tests/common/utils.py @@ -44,9 +44,7 @@ def random_name(): def setup_dummy_db(): options.cfg.set_defaults(options.database_opts, sqlite_synchronous=False) - options.set_defaults(cfg.CONF, - connection="sqlite://", - sqlite_db='bilean.db') + options.set_defaults(cfg.CONF, connection="sqlite://") engine = get_engine() db_api.db_sync(engine) engine.connect() diff --git a/setup.cfg b/setup.cfg index 7d0be57..b7ad1ca 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,7 +16,6 @@ classifier = Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.5 [files] diff --git a/tox.ini b/tox.ini index 73ff61f..a13966e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = py35,py34,py27,pep8 +envlist = py35,py27,pep8 skipsdist = True [testenv]