common/test/unittest_migration.py
branchstable
changeset 2275 bc0bed0616a3
parent 1977 606923dff11b
child 2657 de974465d381
--- a/common/test/unittest_migration.py	Mon Jul 06 11:01:41 2009 +0200
+++ b/common/test/unittest_migration.py	Mon Jul 06 13:24:10 2009 +0200
@@ -13,7 +13,8 @@
 from cubicweb.devtools.apptest import TestEnvironment
 
 from cubicweb.cwconfig import CubicWebConfiguration
-from cubicweb.common.migration import migration_files, filter_scripts
+from cubicweb.common.migration import MigrationHelper, filter_scripts
+from cubicweb.server.migractions import ServerMigrationHelper
 
 
 class Schema(dict):
@@ -39,82 +40,53 @@
         self.config.__class__.cubicweb_vobject_path = frozenset()
         self.config.__class__.cube_vobject_path = frozenset()
 
-    def test_migration_files_base(self):
-        self.assertListEquals(migration_files(self.config, [('cubicweb', (2,3,0), (2,4,0)),
-                                                            ('TEMPLATE', (0,0,2), (0,0,3))]),
-                              [SMIGRDIR+'bootstrapmigration_repository.py',
-                               TMIGRDIR+'0.0.3_Any.py'])
-        self.assertListEquals(migration_files(self.config, [('cubicweb', (2,4,0), (2,5,0)),
-                                                            ('TEMPLATE', (0,0,2), (0,0,3))]),
-                              [SMIGRDIR+'bootstrapmigration_repository.py',
-                               SMIGRDIR+'2.5.0_Any.sql',
-                               TMIGRDIR+'0.0.3_Any.py'])
-        self.assertListEquals(migration_files(self.config, [('cubicweb', (2,5,0), (2,6,0)),
-                                                            ('TEMPLATE', (0,0,3), (0,0,4))]),
-                              [SMIGRDIR+'bootstrapmigration_repository.py',
-                               SMIGRDIR+'2.6.0_Any.sql',
-                               TMIGRDIR+'0.0.4_Any.py'])
+    def test_filter_scripts_base(self):
+        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,3,0), (2,4,0)),
+                              [])
+        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,4,0), (2,5,0)),
+                              [((2, 5, 0), SMIGRDIR+'2.5.0_Any.sql')])
+        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,5,0), (2,6,0)),
+                              [((2, 6, 0), SMIGRDIR+'2.6.0_Any.sql')])
+        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,4,0), (2,6,0)),
+                              [((2, 5, 0), SMIGRDIR+'2.5.0_Any.sql'),
+                               ((2, 6, 0), SMIGRDIR+'2.6.0_Any.sql')])
+        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,5,0), (2,5,1)),
+                              [])
+        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,5,0), (2,10,2)),
+                              [((2, 6, 0), SMIGRDIR+'2.6.0_Any.sql'),
+                               ((2, 10, 2), SMIGRDIR+'2.10.2_Any.sql')])
+        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,5,1), (2,6,0)),
+                              [((2, 6, 0), SMIGRDIR+'2.6.0_Any.sql')])
 
-##     def test_migration_files_overlap(self):
-##         self.assertListEquals(migration_files(self.config, (2,4,0), (2,10,2),
-##                                               (0,0,2), (0,1,2)),
-##                               [SMIGRDIR+'bootstrapmigration_repository.py',
-##                                TMIGRDIR+'0.0.3_Any.py',
-##                                TMIGRDIR+'0.0.4_Any.py',
-##                                SMIGRDIR+'2.4.0_2.5.0_Any.sql',
-##                                SMIGRDIR+'2.5.1_2.6.0_Any.sql',
-##                                TMIGRDIR+'0.1.0_Any.py',
-##                                TMIGRDIR+'0.1.0_common.py',
-##                                TMIGRDIR+'0.1.0_repository.py',
-##                                TMIGRDIR+'0.1.2_Any.py',
-##                                SMIGRDIR+'2.10.1_2.10.2_Any.sql'])
+        self.assertListEquals(filter_scripts(self.config, TMIGRDIR, (0,0,2), (0,0,3)),
+                              [((0, 0, 3), TMIGRDIR+'0.0.3_Any.py')])
+        self.assertListEquals(filter_scripts(self.config, TMIGRDIR, (0,0,2), (0,0,4)),
+                              [((0, 0, 3), TMIGRDIR+'0.0.3_Any.py'),
+                               ((0, 0, 4), TMIGRDIR+'0.0.4_Any.py')])
 
-    def test_migration_files_for_mode(self):
-        from cubicweb.server.migractions import ServerMigrationHelper
+    def test_filter_scripts_for_mode(self):
         self.assertIsInstance(self.config.migration_handler(), ServerMigrationHelper)
-        from cubicweb.common.migration import MigrationHelper
         config = CubicWebConfiguration('data')
         config.verbosity = 0
         self.assert_(not isinstance(config.migration_handler(), ServerMigrationHelper))
         self.assertIsInstance(config.migration_handler(), MigrationHelper)
         config = self.config
         config.__class__.name = 'twisted'
-        self.assertListEquals(migration_files(config, [('TEMPLATE', (0,0,4), (0,1,0))]),
-                              [TMIGRDIR+'0.1.0_common.py',
-                               TMIGRDIR+'0.1.0_web.py'])
-        config.__class__.name = 'repository'
-        self.assertListEquals(migration_files(config, [('TEMPLATE', (0,0,4), (0,1,0))]),
-                              [SMIGRDIR+'bootstrapmigration_repository.py',
-                               TMIGRDIR+'0.1.0_Any.py',
-                               TMIGRDIR+'0.1.0_common.py',
-                               TMIGRDIR+'0.1.0_repository.py'])
-        config.__class__.name = 'all-in-one'
-        self.assertListEquals(migration_files(config, [('TEMPLATE', (0,0,4), (0,1,0))]),
-                              [SMIGRDIR+'bootstrapmigration_repository.py',
-                               TMIGRDIR+'0.1.0_Any.py',
-                               TMIGRDIR+'0.1.0_common.py',
-                               TMIGRDIR+'0.1.0_repository.py',
-                               TMIGRDIR+'0.1.0_web.py'])
+        self.assertListEquals(filter_scripts(config, TMIGRDIR, (0,0,4), (0,1,0)),
+                              [((0, 1 ,0), TMIGRDIR+'0.1.0_common.py'),
+                               ((0, 1 ,0), TMIGRDIR+'0.1.0_web.py')])
         config.__class__.name = 'repository'
-
-    def test_filter_scripts(self):
-        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,4,0), (2,5,0)),
-                              [((2, 5, 0), SMIGRDIR+'2.5.0_Any.sql')])
-        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,4,0), (2,6,0)),
-                              [((2, 5, 0), SMIGRDIR+'2.5.0_Any.sql'),
-                               ((2, 6, 0), SMIGRDIR+'2.6.0_Any.sql')])
-        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,5,0), (2,5,1)),
-                              [])
-        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,5,0), (2,6,0)),
-                              [((2, 6, 0), SMIGRDIR+'2.6.0_Any.sql')])
-        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,5,0), (2,10,2)),
-                              [((2, 6, 0), SMIGRDIR+'2.6.0_Any.sql'),
-                               ((2, 10, 2), SMIGRDIR+'2.10.2_Any.sql')])
-        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,5,1), (2,6,0)),
-                              [((2, 6, 0), SMIGRDIR+'2.6.0_Any.sql')])
-        self.assertListEquals(filter_scripts(self.config, SMIGRDIR, (2,5,1), (2,10,2)),
-                              [((2, 6, 0), SMIGRDIR+'2.6.0_Any.sql'),
-                               ((2, 10, 2), SMIGRDIR+'2.10.2_Any.sql')])
+        self.assertListEquals(filter_scripts(config, TMIGRDIR, (0,0,4), (0,1,0)),
+                              [((0, 1 ,0), TMIGRDIR+'0.1.0_Any.py'),
+                               ((0, 1 ,0), TMIGRDIR+'0.1.0_common.py'),
+                               ((0, 1 ,0), TMIGRDIR+'0.1.0_repository.py')])
+        config.__class__.name = 'all-in-one'
+        self.assertListEquals(filter_scripts(config, TMIGRDIR, (0,0,4), (0,1,0)),
+                              [((0, 1 ,0), TMIGRDIR+'0.1.0_Any.py'),
+                               ((0, 1 ,0), TMIGRDIR+'0.1.0_common.py'),
+                               ((0, 1 ,0), TMIGRDIR+'0.1.0_repository.py'),
+                               ((0, 1 ,0), TMIGRDIR+'0.1.0_web.py')])
+        config.__class__.name = 'repository'
 
 
 from cubicweb.devtools import ApptestConfiguration, init_test_database, cleanup_sqlite