1 files changed, 9 insertions, 33 deletions

diff --git a/src/mailman/database/model.py b/src/mailman/database/model.py
index c45517c9b..58d5942a4 100644
--- a/src/mailman/database/model.py
+++ b/src/mailman/database/model.py
@@ -17,7 +17,7 @@
 
 """Base class for all database classes."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -25,8 +25,6 @@ __all__ = [
     ]
 
 
-import sys
-
 from operator import attrgetter
 
 from storm.properties import PropertyPublisherMeta
@@ -44,46 +42,24 @@ class ModelMeta(PropertyPublisherMeta):
         self.__storm_table__ = name.lower()
         super(ModelMeta, self).__init__(name, bases, dict)
         # Register the model class so that it can be more easily cleared.
-        # This is required by the test framework.
-        if name == 'Model':
-            return
-        ModelMeta._class_registry.add(self)
+        # This is required by the test framework so that the corresponding
+        # table can be reset between tests.
+        #
+        # The PRESERVE flag indicates whether the table should be reset or
+        # not.  We have to handle the actual Model base class explicitly
+        # because it does not correspond to a table in the database.
+        if not getattr(self, 'PRESERVE', False) and name != 'Model':
+            ModelMeta._class_registry.add(self)
 
     @staticmethod
     def _reset(store):
         from mailman.config import config
-        from mailman.model.version import Version
         config.db._pre_reset(store)
-        # Give each schema migration a chance to do its pre-reset.  See below
-        # for calling its post reset too.
-        versions = sorted(version.version for version in
-                          store.find(Version, component='schema'))
-        migrations = {}
-        for version in versions:
-            # We have to give the migrations module that loaded this version a
-            # chance to do both pre- and post-reset operations.  The following
-            # find the actual the module path for the migration.  See
-            # StormBaseDatabase.load_schema().
-            migration = store.find(Version, component=version).one()
-            if migration is None:
-                continue
-            migrations[version] = module_path = migration.version
-            module = sys.modules[module_path]
-            pre_reset = getattr(module, 'pre_reset', None)
-            if pre_reset is not None:
-                pre_reset(store)
         # Make sure this is deterministic, by sorting on the storm table name.
         classes = sorted(ModelMeta._class_registry,
                          key=attrgetter('__storm_table__'))
         for model_class in classes:
             store.find(model_class).remove()
-        # Now give each migration a chance to do post-reset operations.
-        for version in versions:
-            module = sys.modules[migrations[version]]
-            post_reset = getattr(module, 'post_reset', None)
-            if post_reset is not None:
-                post_reset(store)
-        config.db._post_reset(store)