diff options
| -rw-r--r-- | src/mailman/database/base.py | 6 | ||||
| -rw-r--r-- | src/mailman/testing/layers.py | 3 | ||||
| -rw-r--r-- | src/mailman/testing/testing.cfg | 6 |
3 files changed, 3 insertions, 12 deletions
diff --git a/src/mailman/database/base.py b/src/mailman/database/base.py index 2b86899bc..55edf6005 100644 --- a/src/mailman/database/base.py +++ b/src/mailman/database/base.py @@ -114,9 +114,3 @@ class SABaseDatabase: session = sessionmaker(bind=self.engine) self.store = session() self.store.commit() - - # XXX BAW Why doesn't model.py _reset() do this? - def destroy(self): - """Drop all database tables""" - from mailman.database.model import Model - Model.metadata.drop_all(self.engine) diff --git a/src/mailman/testing/layers.py b/src/mailman/testing/layers.py index 006feef9c..74ad99dc8 100644 --- a/src/mailman/testing/layers.py +++ b/src/mailman/testing/layers.py @@ -194,9 +194,6 @@ class ConfigLayer(MockAndMonkeyLayer): # Destroy the test database after the tests are done so that there is # no data in case the tests are rerun with a database layer like mysql # or postgresql which are not deleted in teardown. - # - # XXX 2014-11-01 BAW: Shouldn't reset_the_world() take care of this? - config.db.destroy() config.pop('test config') shutil.rmtree(cls.var_dir) cls.var_dir = None diff --git a/src/mailman/testing/testing.cfg b/src/mailman/testing/testing.cfg index 12646c680..b61b36604 100644 --- a/src/mailman/testing/testing.cfg +++ b/src/mailman/testing/testing.cfg @@ -18,9 +18,9 @@ # A testing configuration. # For testing against PostgreSQL. -[database] -class: mailman.database.postgresql.PostgreSQLDatabase -url: postgresql://barry:barry@localhost:5432/mailman +#[database] +#class: mailman.database.postgresql.PostgreSQLDatabase +#url: postgresql://barry:barry@localhost:5432/mailman [mailman] site_owner: noreply@example.com |