From 5598b9eea196e4085aa91aaf8a0cacaffa200355 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Mon, 23 Jul 2012 10:40:53 -0400 Subject: Checkpointing Postgres port of test suite. - Refactor load_schema() into a separate load_sql() method. - Add API for test suite to make a temporary database. - Add code to migrate the PostgreSQL database. - Comment out `moderation_callback` from the PostgreSQL SQL; this must have snuck in accidentally via the contributed port. - Refactor test_migrations.py --- src/mailman/database/sqlite.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'src/mailman/database/sqlite.py') diff --git a/src/mailman/database/sqlite.py b/src/mailman/database/sqlite.py index 2677d0d71..4e5df55a5 100644 --- a/src/mailman/database/sqlite.py +++ b/src/mailman/database/sqlite.py @@ -26,12 +26,24 @@ __all__ = [ import os +import shutil +import tempfile from urlparse import urlparse from mailman.database.base import StormBaseDatabase + +class _TemporaryDB: + def __init__(self, database, tempdir): + self.database = database + self._tempdir = tempdir + + def cleanup(self): + shutil.rmtree(self._tempdir) + + class SQLiteDatabase(StormBaseDatabase): """Database class for SQLite.""" @@ -41,7 +53,7 @@ class SQLiteDatabase(StormBaseDatabase): def _database_exists(self, store): """See `BaseDatabase`.""" table_query = 'select tbl_name from sqlite_master;' - table_names = set(item[0] for item in + table_names = set(item[0] for item in store.execute(table_query)) return 'version' in table_names @@ -54,3 +66,13 @@ class SQLiteDatabase(StormBaseDatabase): # Ignore errors if fd > 0: os.close(fd) + + @staticmethod + def _make_temporary(): + from mailman.testing.helpers import configuration + tempdir = tempfile.mkdtemp() + url = 'sqlite:///' + os.path.join(tempdir, 'mailman.db') + database = SQLiteDatabase() + with configuration('database', url=url): + database.initialize() + return _TemporaryDB(database, tempdir) -- cgit v1.2.3-70-g09d2