diff options
Diffstat (limited to 'migrate/tests/versioning')
| -rw-r--r-- | migrate/tests/versioning/test_cfgparse.py | 2 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_keyedinstance.py | 2 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_pathed.py | 4 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_repository.py | 14 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_schema.py | 12 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_schemadiff.py | 12 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_script.py | 2 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_shell.py | 30 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_util.py | 8 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_version.py | 12 |
10 files changed, 49 insertions, 49 deletions
diff --git a/migrate/tests/versioning/test_cfgparse.py b/migrate/tests/versioning/test_cfgparse.py index 27f52cd..1d0d7e8 100644 --- a/migrate/tests/versioning/test_cfgparse.py +++ b/migrate/tests/versioning/test_cfgparse.py @@ -17,7 +17,7 @@ class TestConfigParser(fixture.Base): parser.set('section','option','value') self.assertEqual(parser.get('section', 'option'), 'value') self.assertEqual(parser.to_dict()['section']['option'], 'value') - + def test_table_config(self): """We should be able to specify the table to be used with a repository""" default_text = Repository.prepare_config(Template().get_repository(), diff --git a/migrate/tests/versioning/test_keyedinstance.py b/migrate/tests/versioning/test_keyedinstance.py index 28f3b2b..d5e6ba2 100644 --- a/migrate/tests/versioning/test_keyedinstance.py +++ b/migrate/tests/versioning/test_keyedinstance.py @@ -19,7 +19,7 @@ class TestKeydInstance(fixture.Base): return str(key) def __init__(self,value): self.value=value - + a10 = Uniq1('a') # Different key: different instance diff --git a/migrate/tests/versioning/test_pathed.py b/migrate/tests/versioning/test_pathed.py index 7616e9d..2798067 100644 --- a/migrate/tests/versioning/test_pathed.py +++ b/migrate/tests/versioning/test_pathed.py @@ -12,7 +12,7 @@ class TestPathed(fixture.Base): self.assert_(result==Pathed._parent_path(filepath)) self.assert_(result==Pathed._parent_path(dirpath)) self.assert_(result==Pathed._parent_path(sdirpath)) - + def test_new(self): """Pathed(path) shouldn't create duplicate objects of the same path""" path='/fgsfds' @@ -34,7 +34,7 @@ class TestPathed(fixture.Base): parent=None children=0 def _init_child(self,child,path): - """Keep a tally of children. + """Keep a tally of children. (A real class might do something more interesting here) """ self.__class__.children+=1 diff --git a/migrate/tests/versioning/test_repository.py b/migrate/tests/versioning/test_repository.py index 7065368..37bb5e7 100644 --- a/migrate/tests/versioning/test_repository.py +++ b/migrate/tests/versioning/test_repository.py @@ -32,7 +32,7 @@ class TestRepository(fixture.Pathed): # Can't create it again: it already exists self.assertRaises(exceptions.PathFoundError, Repository.create, path, name) return path - + def test_load(self): """We should be able to load information about an existing repository""" # Create a repository to load @@ -45,7 +45,7 @@ class TestRepository(fixture.Pathed): # version_table's default isn't none self.assertNotEquals(repos.config.get('db_settings', 'version_table'), 'None') - + def test_load_notfound(self): """Nonexistant repositories shouldn't be loaded""" path = self.tmp_repos() @@ -54,7 +54,7 @@ class TestRepository(fixture.Pathed): def test_load_invalid(self): """Invalid repos shouldn't be loaded""" - # Here, invalid=empty directory. There may be other conditions too, + # Here, invalid=empty directory. There may be other conditions too, # but we shouldn't need to test all of them path = self.tmp_repos() os.mkdir(path) @@ -136,7 +136,7 @@ class TestVersionedRepository(fixture.Pathed): repos.create_script('') self.assert_(repos.version(repos.latest) is repos.version()) self.assert_(repos.version() is not None) - + def test_changeset(self): """Repositories can create changesets properly""" # Create a nonzero-version repository of empty scripts @@ -201,17 +201,17 @@ class TestVersionedRepository(fixture.Pathed): self.assertEqual(cs.end, 0) check_changeset((10, 5), 5) check_changeset((5, 0), 5) - + def test_many_versions(self): """Test what happens when lots of versions are created""" repos = Repository(self.path_repos) - for i in range(1001): + for i in range(1001): repos.create_script('') # since we normally create 3 digit ones, let's see if we blow up self.assert_(os.path.exists('%s/versions/1000.py' % self.path_repos)) self.assert_(os.path.exists('%s/versions/1001.py' % self.path_repos)) - + # TODO: test manage file # TODO: test changeset diff --git a/migrate/tests/versioning/test_schema.py b/migrate/tests/versioning/test_schema.py index 7502783..0089c38 100644 --- a/migrate/tests/versioning/test_schema.py +++ b/migrate/tests/versioning/test_schema.py @@ -53,7 +53,7 @@ class TestControlledSchema(fixture.Pathed, fixture.DB): # Trying to create another DB this way fails: table exists self.assertRaises(exceptions.DatabaseAlreadyControlledError, ControlledSchema.create, self.engine, self.repos) - + # We can load a controlled DB this way, too dbcontrol0 = ControlledSchema(self.engine, self.repos) self.assertEqual(dbcontrol, dbcontrol0) @@ -67,7 +67,7 @@ class TestControlledSchema(fixture.Pathed, fixture.DB): dbcontrol0 = ControlledSchema(engine, self.repos.path) self.assertEqual(dbcontrol, dbcontrol0) - # Clean up: + # Clean up: dbcontrol.drop() # Attempting to drop vc from a db without it should fail @@ -84,7 +84,7 @@ class TestControlledSchema(fixture.Pathed, fixture.DB): version = 0 dbcontrol = ControlledSchema.create(self.engine, self.repos, version) self.assertEqual(dbcontrol.version, version) - + # Correct when we load it, too dbcontrol = ControlledSchema(self.engine, self.repos) self.assertEqual(dbcontrol.version, version) @@ -125,7 +125,7 @@ class TestControlledSchema(fixture.Pathed, fixture.DB): def test_changeset(self): """Create changeset from controlled schema""" dbschema = ControlledSchema.create(self.engine, self.repos) - + # empty schema doesn't have changesets cs = dbschema.changeset() self.assertEqual(cs, {}) @@ -143,7 +143,7 @@ class TestControlledSchema(fixture.Pathed, fixture.DB): @fixture.usedb() def test_upgrade_runchange(self): dbschema = ControlledSchema.create(self.engine, self.repos) - + for i in range(10): self.repos.create_script('') @@ -184,7 +184,7 @@ class TestControlledSchema(fixture.Pathed, fixture.DB): dbschema = ControlledSchema.create(self.engine, self.repos) meta = self.construct_model() - + dbschema.update_db_from_model(meta) # TODO: test for table version in db diff --git a/migrate/tests/versioning/test_schemadiff.py b/migrate/tests/versioning/test_schemadiff.py index 1ff353f..ec6d1dc 100644 --- a/migrate/tests/versioning/test_schemadiff.py +++ b/migrate/tests/versioning/test_schemadiff.py @@ -18,7 +18,7 @@ class SchemaDiffBase(fixture.DB): ) if kw.get('create',True): self.table.create() - + def _assert_diff(self,col_A,col_B): self._make_table(col_A) self.meta.clear() @@ -43,16 +43,16 @@ class SchemaDiffBase(fixture.DB): self.name2, cd.col_B ),str(diff)) - + class Test_getDiffOfModelAgainstDatabase(SchemaDiffBase): name1 = 'model' name2 = 'database' - + def _run_diff(self,**kw): return schemadiff.getDiffOfModelAgainstDatabase( self.meta, self.engine, **kw ) - + @fixture.usedb() def test_table_missing_in_db(self): self._make_table(create=False) @@ -187,7 +187,7 @@ class Test_getDiffOfModelAgainstDatabase(SchemaDiffBase): Column('data', String(10)), Column('data', String(20)), ) - + @fixture.usedb() def test_integer_identical(self): self._make_table( @@ -196,7 +196,7 @@ class Test_getDiffOfModelAgainstDatabase(SchemaDiffBase): diff = self._run_diff() self.assertEqual('No schema diffs',str(diff)) self.assertFalse(diff) - + @fixture.usedb() def test_string_identical(self): self._make_table( diff --git a/migrate/tests/versioning/test_script.py b/migrate/tests/versioning/test_script.py index b52ddaa..95ee58c 100644 --- a/migrate/tests/versioning/test_script.py +++ b/migrate/tests/versioning/test_script.py @@ -223,7 +223,7 @@ User = Table('User', meta, f = open(path, 'w') f.write(contents) f.close() - + class TestSqlScript(fixture.Pathed, fixture.DB): diff --git a/migrate/tests/versioning/test_shell.py b/migrate/tests/versioning/test_shell.py index 0bf5e22..4ba6bce 100644 --- a/migrate/tests/versioning/test_shell.py +++ b/migrate/tests/versioning/test_shell.py @@ -52,7 +52,7 @@ class TestShellCommands(Shell): try: original = sys.argv sys.argv=['X','--help'] - + run_module('migrate.versioning.shell', run_name='__main__') finally: @@ -73,7 +73,7 @@ class TestShellCommands(Shell): sys.stderr = original actual = actual.getvalue() self.assertTrue(expected in actual,'%r not in:\n"""\n%s\n"""'%(expected,actual)) - + def test_main(self): """Test main() function""" repos = self.tmp_repos() @@ -106,7 +106,7 @@ class TestShellCommands(Shell): result = self.env.run('migrate create %s repository_name' % repos, expect_error=True) self.assertEqual(result.returncode, 2) - + def test_script(self): """We can create a migration script via the command line""" repos = self.tmp_repos() @@ -202,7 +202,7 @@ class TestShellDatabase(Shell, DB): # we need to connect to the DB to see if things worked level = DB.CONNECT - + @usedb() def test_version_control(self): """Ensure we can set version control on a database""" @@ -298,7 +298,7 @@ class TestShellDatabase(Shell, DB): result = self.env.run('migrate upgrade %s %s' % (self.url, repos_path)) self.assertEqual(self.run_db_version(self.url, repos_path), 1) - + # Downgrade must have a valid version specified result = self.env.run('migrate downgrade %s %s' % (self.url, repos_path), expect_error=True) self.assertEqual(result.returncode, 2) @@ -307,10 +307,10 @@ class TestShellDatabase(Shell, DB): result = self.env.run('migrate downgrade %s %s 2' % (self.url, repos_path), expect_error=True) self.assertEqual(result.returncode, 2) self.assertEqual(self.run_db_version(self.url, repos_path), 1) - + result = self.env.run('migrate downgrade %s %s 0' % (self.url, repos_path)) self.assertEqual(self.run_db_version(self.url, repos_path), 0) - + result = self.env.run('migrate downgrade %s %s 1' % (self.url, repos_path), expect_error=True) self.assertEqual(result.returncode, 2) self.assertEqual(self.run_db_version(self.url, repos_path), 0) @@ -348,7 +348,7 @@ class TestShellDatabase(Shell, DB): self.assertRaises(Exception, self.engine.text('select * from t_table').execute) # The tests below are written with some postgres syntax, but the stuff - # being tested (.sql files) ought to work with any db. + # being tested (.sql files) ought to work with any db. @usedb(supported='postgres') def test_sqlfile(self): upgrade_script = """ @@ -362,7 +362,7 @@ class TestShellDatabase(Shell, DB): """ self.meta.drop_all() self._run_test_sqlfile(upgrade_script, downgrade_script) - + @usedb(supported='postgres') def test_sqlfile_comment(self): upgrade_script = """ @@ -400,11 +400,11 @@ class TestShellDatabase(Shell, DB): script_text=''' from sqlalchemy import * from migrate import * - + def upgrade(): print 'fgsfds' raise Exception() - + def downgrade(): print 'sdfsgf' raise Exception() @@ -425,7 +425,7 @@ class TestShellDatabase(Shell, DB): from migrate import * from migrate.changeset import schema - + meta = MetaData(migrate_engine) account = Table('account', meta, Column('id', Integer, primary_key=True), @@ -436,7 +436,7 @@ class TestShellDatabase(Shell, DB): # Upgrade operations go here. Don't create your own engine; use the engine # named 'migrate_engine' imported from migrate. meta.create_all() - + def downgrade(): # Operations to reverse the above upgrade go here. meta.drop_all() @@ -447,7 +447,7 @@ class TestShellDatabase(Shell, DB): result = self.env.run('migrate test %s %s' % (self.url, repos_path)) self.assertEqual(self.run_version(repos_path), 1) self.assertEqual(self.run_db_version(self.url, repos_path), 0) - + @usedb() def test_rundiffs_in_shell(self): # This is a variant of the test_schemadiff tests but run through the shell level. @@ -542,7 +542,7 @@ class TestShellDatabase(Shell, DB): ## Operations to reverse the above upgrade go here. #meta.bind = migrate_engine #tmp_account_rundiffs.drop()''') - + ## Save the upgrade script. #result = self.env.run('migrate script Desc %s' % repos_path) #upgrade_script_path = '%s/versions/001_Desc.py' % repos_path diff --git a/migrate/tests/versioning/test_util.py b/migrate/tests/versioning/test_util.py index b6b1490..db4ea26 100644 --- a/migrate/tests/versioning/test_util.py +++ b/migrate/tests/versioning/test_util.py @@ -45,7 +45,7 @@ class TestUtil(fixture.Pathed): # py 2.4 compatability :-/ cw = catch_warnings(record=True) w = cw.__enter__() - + warnings.simplefilter("always") engine = construct_engine(url, echo='True') self.assertTrue(engine.echo) @@ -69,7 +69,7 @@ class TestUtil(fixture.Pathed): api.create(repo, 'temp') api.script('First Version', repo) engine = construct_engine('sqlite:///:memory:') - + api.version_control(engine, repo) api.upgrade(engine, repo) @@ -103,7 +103,7 @@ class TestUtil(fixture.Pathed): # py 2.4 compatability :-/ cw = catch_warnings(record=True) w = cw.__enter__() - + warnings.simplefilter("always") # deprecated spelling @@ -117,7 +117,7 @@ class TestUtil(fixture.Pathed): 'model should be in form of module.model:User ' 'and not module.model.User', str(w[-1].message)) - + finally: cw.__exit__() diff --git a/migrate/tests/versioning/test_version.py b/migrate/tests/versioning/test_version.py index f521659..25ab2b1 100644 --- a/migrate/tests/versioning/test_version.py +++ b/migrate/tests/versioning/test_version.py @@ -68,7 +68,7 @@ class TestVerNum(fixture.Base): self.assert_(VerNum(1) >= 1) self.assert_(VerNum(2) >= 1) self.assertFalse(VerNum(1) >= 2) - + class TestVersion(fixture.Pathed): @@ -128,11 +128,11 @@ class TestVersion(fixture.Pathed): def test_selection(self): """Verify right sql script is selected""" - + # Create empty directory. path = self.tmp_repos() os.mkdir(path) - + # Create files -- files must be present or you'll get an exception later. python_file = '001_initial_.py' sqlite_upgrade_file = '001_sqlite_upgrade.sql' @@ -143,13 +143,13 @@ class TestVersion(fixture.Pathed): ver = Version(1, path, [sqlite_upgrade_file]) self.assertEqual(os.path.basename(ver.script('sqlite', 'upgrade').path), sqlite_upgrade_file) - + ver = Version(1, path, [default_upgrade_file]) self.assertEqual(os.path.basename(ver.script('default', 'upgrade').path), default_upgrade_file) - + ver = Version(1, path, [sqlite_upgrade_file, default_upgrade_file]) self.assertEqual(os.path.basename(ver.script('sqlite', 'upgrade').path), sqlite_upgrade_file) - + ver = Version(1, path, [sqlite_upgrade_file, default_upgrade_file, python_file]) self.assertEqual(os.path.basename(ver.script('postgres', 'upgrade').path), default_upgrade_file) |