diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-11-29 17:38:11 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-11-29 17:38:11 -0500 |
| commit | e03b0dd06940a9262d90ec2699a4452835c05b56 (patch) | |
| tree | 2b55505152b358882777566268e76289151e1be8 | |
| parent | c8c635e18d65fd31cf28617185a70627092e8ab7 (diff) | |
| download | oslo-db-e03b0dd06940a9262d90ec2699a4452835c05b56.tar.gz | |
Ensure provision_new_database is True by default4.15.0
In I3e238b6a97769cf0a352f11e718d5d73eebcfa8a, we restored
zzzeek's overlooking the fact that legacy test suites assume
new DBs are provisioned by default in the legacy test base.
However, zzzeek also made this same assumption in Neutron
Ie27cf174fa24c2f479af47335d9ae139fb7d159a which vendors its
own version of test_base in anticipation of some of these newer
features, so it will break once the provision_new_database flag
becomes false. Favor setting this flag True/False explicitly
and default it to True for compatibility w/ Neutron.
Change-Id: I726cc20481a9bc778b75564526d9245132b43563
| -rw-r--r-- | oslo_db/sqlalchemy/provision.py | 2 | ||||
| -rw-r--r-- | oslo_db/sqlalchemy/test_fixtures.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/oslo_db/sqlalchemy/provision.py b/oslo_db/sqlalchemy/provision.py index a1e1d19..8f4a60c 100644 --- a/oslo_db/sqlalchemy/provision.py +++ b/oslo_db/sqlalchemy/provision.py @@ -111,7 +111,7 @@ class DatabaseResource(testresources.TestResourceManager): """ def __init__(self, database_type, _enginefacade=None, - provision_new_database=False, ad_hoc_url=None): + provision_new_database=True, ad_hoc_url=None): super(DatabaseResource, self).__init__() self.database_type = database_type self.provision_new_database = provision_new_database diff --git a/oslo_db/sqlalchemy/test_fixtures.py b/oslo_db/sqlalchemy/test_fixtures.py index fd954b3..9ee86c8 100644 --- a/oslo_db/sqlalchemy/test_fixtures.py +++ b/oslo_db/sqlalchemy/test_fixtures.py @@ -324,7 +324,8 @@ class SimpleDbFixture(BaseDbFixture): return self._dependency_resources["_db_%s" % self.ident] def _generate_database_resource(self, _enginefacade): - return provision.DatabaseResource(self.driver, _enginefacade) + return provision.DatabaseResource(self.driver, _enginefacade, + provision_new_database=False) def _setUp(self): super(SimpleDbFixture, self)._setUp() @@ -392,7 +393,8 @@ class AdHocDbFixture(SimpleDbFixture): def _generate_database_resource(self, _enginefacade): return provision.DatabaseResource( - self.driver, _enginefacade, ad_hoc_url=self.url) + self.driver, _enginefacade, ad_hoc_url=self.url, + provision_new_database=False) def _cleanup(self): self._teardown_resources() |