From c15688eb88db81340a7602093134e10e8927b2fc Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Wed, 25 Jul 2012 17:48:47 -0400
Subject: Refactor to better handling the difference between a testing database
 and a production database.

- Add an IDatabaseFactory interface with two named utility implementations.
  The initialization subsystem will either ask for the 'testing' or
  'production' factory utility depending on whether we're in the test suite or
  not.  The testing factory returns an IDatabase that can be _reset().

- initialize_2() now takes an optional `testing` argument, defaulting to
  False.  The test ConfigLayer will pass in True.

- Remove _reset() from the base database class.

- The ModelMeta now adds a PRESERVE attribute to database classes.  This
  defaults to False, meaning by default the test framework will reset the
  table.  The Version table is preserved because it records the schema
  migrations.

- Because of the above, we no longer need to support pre_reset() and
  post_reset() on migrations.

Also, bin/mailman should allow the standard configuration file search
algorithm to be used except when -C/--config is given.
---
 src/mailman/core/initialize.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/mailman/core/initialize.py')

diff --git a/src/mailman/core/initialize.py b/src/mailman/core/initialize.py
index b359928cc..3e927cc40 100644
--- a/src/mailman/core/initialize.py
+++ b/src/mailman/core/initialize.py
@@ -40,13 +40,13 @@ import os
 import sys
 
 from pkg_resources import resource_string
+from zope.component import getUtility
 from zope.configuration import xmlconfig
-from zope.interface.verify import verifyObject
 
 import mailman.config.config
 import mailman.core.logging
 
-from mailman.interfaces.database import IDatabase
+from mailman.interfaces.database import IDatabaseFactory
 from mailman.utilities.modules import call_name
 
 # The test infrastructure uses this to prevent the search and loading of any
@@ -125,7 +125,7 @@ def initialize_1(config_path=None):
     mailman.config.config.load(config_path)
 
 
-def initialize_2(debug=False, propagate_logs=None):
+def initialize_2(debug=False, propagate_logs=None, testing=False):
     """Second initialization step.
 
     * Database
@@ -149,13 +149,8 @@ def initialize_2(debug=False, propagate_logs=None):
         call_name(config.mailman.pre_hook)
     # Instantiate the database class, ensure that it's of the right type, and
     # initialize it.  Then stash the object on our configuration object.
-    database_class = config.database['class']
-    database = call_name(database_class)
-    verifyObject(IDatabase, database)
-    database.initialize(debug)
-    database.load_migrations()
-    database.commit()
-    config.db = database
+    utility_name = ('testing' if testing else 'production')
+    config.db = getUtility(IDatabaseFactory, utility_name).create()
     # Initialize the rules and chains.  Do the imports here so as to avoid
     # circular imports.
     from mailman.app.commands import initialize as initialize_commands
-- 
cgit v1.2.3-70-g09d2