diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/database/tests/test_factory.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mailman/database/tests/test_factory.py b/src/mailman/database/tests/test_factory.py index bbfe403ab..597e4d9fe 100644 --- a/src/mailman/database/tests/test_factory.py +++ b/src/mailman/database/tests/test_factory.py @@ -47,12 +47,12 @@ class TestSchemaManager(unittest.TestCase): layer = ConfigLayer def setUp(self): - # Drop the existing database. + # Drop the existing model tables. Model.metadata.drop_all(config.db.engine) + # Drop leftover tables (e.g. Alembic & Storm schema versions). md = MetaData() md.reflect(bind=config.db.engine) - # Drop leftover tables (alembic & storm schema versions) - for table in md.tables.values(): + for table in md.sorted_tables: table.drop(config.db.engine) self.schema_mgr = SchemaManager(config.db) @@ -117,6 +117,7 @@ class TestSchemaManager(unittest.TestCase): @patch('alembic.command.upgrade') def test_initial(self, alembic_command_upgrade): # No existing database. + #import pdb; pdb.set_trace() self.assertFalse(self._table_exists('mailinglist')) self.assertFalse(self._table_exists('alembic_version')) head_rev = self.schema_mgr.setup_database() @@ -124,9 +125,9 @@ class TestSchemaManager(unittest.TestCase): self.assertTrue(self._table_exists('mailinglist')) md = MetaData() md.reflect(bind=config.db.engine) - self.assertTrue('alembic_version' in md.tables.keys()) + self.assertIn('alembic_version', md.tables) current_rev = config.db.engine.execute( - md.tables["alembic_version"].select()).scalar() + md.tables['alembic_version'].select()).scalar() self.assertEqual(current_rev, head_rev) @patch('alembic.command.stamp') |