diff options
Diffstat (limited to 'migrate/tests/versioning')
| -rw-r--r-- | migrate/tests/versioning/test_genmodel.py | 17 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_keyedinstance.py | 2 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_repository.py | 37 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_runchangeset.py | 18 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_schema.py | 20 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_schemadiff.py | 25 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_script.py | 2 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_shell.py | 75 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_util.py | 6 | ||||
| -rw-r--r-- | migrate/tests/versioning/test_version.py | 26 |
10 files changed, 112 insertions, 116 deletions
diff --git a/migrate/tests/versioning/test_genmodel.py b/migrate/tests/versioning/test_genmodel.py index db35aa4..e36bea1 100644 --- a/migrate/tests/versioning/test_genmodel.py +++ b/migrate/tests/versioning/test_genmodel.py @@ -4,7 +4,6 @@ import os import sqlalchemy from sqlalchemy import * -from nose.tools import eq_ from migrate.versioning import genmodel, schemadiff from migrate.changeset import schema @@ -45,7 +44,7 @@ class TestSchemaDiff(fixture.DB): def assertDiff(isDiff, tablesMissingInDatabase, tablesMissingInModel, tablesWithDiff): diff = schemadiff.getDiffOfModelAgainstDatabase(self.meta, self.engine, excludeTables=['migrate_version']) - eq_( + self.assertEqual( (diff.tables_missing_from_B, diff.tables_missing_from_A, diff.tables_different.keys(), @@ -66,7 +65,7 @@ class TestSchemaDiff(fixture.DB): # Feature test for a recent SQLa feature; # expect different output in that case. if repr(String()) == 'String()': - self.assertEqualsIgnoreWhitespace(decls, ''' + self.assertEqualIgnoreWhitespace(decls, ''' from migrate.changeset import schema pre_meta = MetaData() post_meta = MetaData() @@ -77,7 +76,7 @@ class TestSchemaDiff(fixture.DB): ) ''') else: - self.assertEqualsIgnoreWhitespace(decls, ''' + self.assertEqualIgnoreWhitespace(decls, ''' from migrate.changeset import schema pre_meta = MetaData() post_meta = MetaData() @@ -157,8 +156,8 @@ class TestSchemaDiff(fixture.DB): # Make sure data is still present. result = self.engine.execute(self.table.select(self.table.c.id==dataId)) rows = result.fetchall() - eq_(len(rows), 1) - eq_(rows[0].name, 'mydata') + self.assertEqual(len(rows), 1) + self.assertEqual(rows[0].name, 'mydata') # Add data, later we'll make sure it's still present. result = self.engine.execute(self.table.insert(), id=2, name=u'mydata2', data2=123) @@ -185,9 +184,9 @@ class TestSchemaDiff(fixture.DB): # Make sure data is still present. result = self.engine.execute(self.table.select(self.table.c.id==dataId2)) rows = result.fetchall() - self.assertEquals(len(rows), 1) - self.assertEquals(rows[0].name, 'mydata2') - self.assertEquals(rows[0].data2, '123') + self.assertEqual(len(rows), 1) + self.assertEqual(rows[0].name, 'mydata2') + self.assertEqual(rows[0].data2, '123') # Delete data, since we're about to make a required column. # Not even using sqlalchemy.PassiveDefault helps because we're doing explicit column select. diff --git a/migrate/tests/versioning/test_keyedinstance.py b/migrate/tests/versioning/test_keyedinstance.py index b2f87ac..28f3b2b 100644 --- a/migrate/tests/versioning/test_keyedinstance.py +++ b/migrate/tests/versioning/test_keyedinstance.py @@ -35,7 +35,7 @@ class TestKeydInstance(fixture.Base): self.assert_(a10 is a11) # __init__ is called - self.assertEquals(a10.value,'a') + self.assertEqual(a10.value,'a') # clear() causes us to forget all existing instances Uniq1.clear() diff --git a/migrate/tests/versioning/test_repository.py b/migrate/tests/versioning/test_repository.py index a926f2c..7065368 100644 --- a/migrate/tests/versioning/test_repository.py +++ b/migrate/tests/versioning/test_repository.py @@ -7,7 +7,6 @@ import shutil from migrate import exceptions from migrate.versioning.repository import * from migrate.versioning.script import * -from nose.tools import raises from migrate.tests import fixture from datetime import datetime @@ -76,7 +75,7 @@ class TestVersionedRepository(fixture.Pathed): repos = Repository(self.path_repos) # Get latest version, or detect if a specified version exists - self.assertEquals(repos.latest, 0) + self.assertEqual(repos.latest, 0) # repos.latest isn't an integer, but a VerNum # (so we can't just assume the following tests are correct) self.assert_(repos.latest >= 0) @@ -84,14 +83,14 @@ class TestVersionedRepository(fixture.Pathed): # Create a script and test again repos.create_script('') - self.assertEquals(repos.latest, 1) + self.assertEqual(repos.latest, 1) self.assert_(repos.latest >= 0) self.assert_(repos.latest >= 1) self.assert_(repos.latest < 2) # Create a new script and test again repos.create_script('') - self.assertEquals(repos.latest, 2) + self.assertEqual(repos.latest, 2) self.assert_(repos.latest >= 0) self.assert_(repos.latest >= 1) self.assert_(repos.latest >= 2) @@ -103,7 +102,7 @@ class TestVersionedRepository(fixture.Pathed): repos.config.set('db_settings', 'use_timestamp_numbering', 'True') # Get latest version, or detect if a specified version exists - self.assertEquals(repos.latest, 0) + self.assertEqual(repos.latest, 0) # repos.latest isn't an integer, but a VerNum # (so we can't just assume the following tests are correct) self.assert_(repos.latest >= 0) @@ -113,7 +112,7 @@ class TestVersionedRepository(fixture.Pathed): now = int(datetime.utcnow().strftime('%Y%m%d%H%M%S')) repos.create_script('') print repos.latest - self.assertEquals(repos.latest, now) + self.assertEqual(repos.latest, now) def test_source(self): """Get a script object by version number and view its source""" @@ -148,7 +147,7 @@ class TestVersionedRepository(fixture.Pathed): def check_changeset(params, length): """Creates and verifies a changeset""" changeset = repos.changeset('postgres', *params) - self.assertEquals(len(changeset), length) + self.assertEqual(len(changeset), length) self.assertTrue(isinstance(changeset, Changeset)) uniq = list() # Changesets are iterable @@ -161,10 +160,10 @@ class TestVersionedRepository(fixture.Pathed): # Upgrade to a specified version... cs = check_changeset((0, 10), 10) - self.assertEquals(cs.keys().pop(0),0 ) # 0 -> 1: index is starting version - self.assertEquals(cs.keys().pop(), 9) # 9 -> 10: index is starting version - self.assertEquals(cs.start, 0) # starting version - self.assertEquals(cs.end, 10) # ending version + self.assertEqual(cs.keys().pop(0),0 ) # 0 -> 1: index is starting version + self.assertEqual(cs.keys().pop(), 9) # 9 -> 10: index is starting version + self.assertEqual(cs.start, 0) # starting version + self.assertEqual(cs.end, 10) # ending version check_changeset((0, 1), 1) check_changeset((0, 5), 5) check_changeset((0, 0), 0) @@ -178,10 +177,10 @@ class TestVersionedRepository(fixture.Pathed): # Upgrade to the latest version... cs = check_changeset((0,), 10) - self.assertEquals(cs.keys().pop(0), 0) - self.assertEquals(cs.keys().pop(), 9) - self.assertEquals(cs.start, 0) - self.assertEquals(cs.end, 10) + self.assertEqual(cs.keys().pop(0), 0) + self.assertEqual(cs.keys().pop(), 9) + self.assertEqual(cs.start, 0) + self.assertEqual(cs.end, 10) check_changeset((1,), 9) check_changeset((5,), 5) check_changeset((9,), 1) @@ -196,10 +195,10 @@ class TestVersionedRepository(fixture.Pathed): # Downgrade cs = check_changeset((10, 0),10) - self.assertEquals(cs.keys().pop(0), 10) # 10 -> 9 - self.assertEquals(cs.keys().pop(), 1) # 1 -> 0 - self.assertEquals(cs.start, 10) - self.assertEquals(cs.end, 0) + self.assertEqual(cs.keys().pop(0), 10) # 10 -> 9 + self.assertEqual(cs.keys().pop(), 1) # 1 -> 0 + self.assertEqual(cs.start, 10) + self.assertEqual(cs.end, 0) check_changeset((10, 5), 5) check_changeset((5, 0), 5) diff --git a/migrate/tests/versioning/test_runchangeset.py b/migrate/tests/versioning/test_runchangeset.py index 52b0215..12bc77c 100644 --- a/migrate/tests/versioning/test_runchangeset.py +++ b/migrate/tests/versioning/test_runchangeset.py @@ -31,22 +31,22 @@ class TestRunChangeset(fixture.Pathed,fixture.DB): # Scripts are empty; we'll check version # correctness. # (Correct application of their content is checked elsewhere) - self.assertEquals(db.version,0) + self.assertEqual(db.version,0) db.upgrade(1) - self.assertEquals(db.version,1) + self.assertEqual(db.version,1) db.upgrade(5) - self.assertEquals(db.version,5) + self.assertEqual(db.version,5) db.upgrade(5) - self.assertEquals(db.version,5) + self.assertEqual(db.version,5) db.upgrade(None) # Latest is implied - self.assertEquals(db.version,10) + self.assertEqual(db.version,10) self.assertRaises(Exception,db.upgrade,11) - self.assertEquals(db.version,10) + self.assertEqual(db.version,10) db.upgrade(9) - self.assertEquals(db.version,9) + self.assertEqual(db.version,9) db.upgrade(0) - self.assertEquals(db.version,0) + self.assertEqual(db.version,0) self.assertRaises(Exception,db.upgrade,-1) - self.assertEquals(db.version,0) + self.assertEqual(db.version,0) #changeset = repos.changeset(self.url,0) db.drop() diff --git a/migrate/tests/versioning/test_schema.py b/migrate/tests/versioning/test_schema.py index 8b0033c..7502783 100644 --- a/migrate/tests/versioning/test_schema.py +++ b/migrate/tests/versioning/test_schema.py @@ -56,16 +56,16 @@ class TestControlledSchema(fixture.Pathed, fixture.DB): # We can load a controlled DB this way, too dbcontrol0 = ControlledSchema(self.engine, self.repos) - self.assertEquals(dbcontrol, dbcontrol0) + self.assertEqual(dbcontrol, dbcontrol0) # We can also use a repository path, instead of a repository dbcontrol0 = ControlledSchema(self.engine, self.repos.path) - self.assertEquals(dbcontrol, dbcontrol0) + self.assertEqual(dbcontrol, dbcontrol0) # We don't have to use the same connection engine = create_engine(self.url) dbcontrol0 = ControlledSchema(engine, self.repos.path) - self.assertEquals(dbcontrol, dbcontrol0) + self.assertEqual(dbcontrol, dbcontrol0) # Clean up: dbcontrol.drop() @@ -83,11 +83,11 @@ class TestControlledSchema(fixture.Pathed, fixture.DB): # Establish version control on this database version = 0 dbcontrol = ControlledSchema.create(self.engine, self.repos, version) - self.assertEquals(dbcontrol.version, version) + self.assertEqual(dbcontrol.version, version) # Correct when we load it, too dbcontrol = ControlledSchema(self.engine, self.repos) - self.assertEquals(dbcontrol.version, version) + self.assertEqual(dbcontrol.version, version) dbcontrol.drop() @@ -95,16 +95,16 @@ class TestControlledSchema(fixture.Pathed, fixture.DB): version = 10 for i in range(version): self.repos.create_script('') - self.assertEquals(self.repos.latest, version) + self.assertEqual(self.repos.latest, version) # Test with some mid-range value dbcontrol = ControlledSchema.create(self.engine,self.repos, 5) - self.assertEquals(dbcontrol.version, 5) + self.assertEqual(dbcontrol.version, 5) dbcontrol.drop() # Test with max value dbcontrol = ControlledSchema.create(self.engine, self.repos, version) - self.assertEquals(dbcontrol.version, version) + self.assertEqual(dbcontrol.version, version) dbcontrol.drop() @fixture.usedb() @@ -132,7 +132,7 @@ class TestControlledSchema(fixture.Pathed, fixture.DB): for i in range(5): self.repos.create_script('') - self.assertEquals(self.repos.latest, 5) + self.assertEqual(self.repos.latest, 5) cs = dbschema.changeset(5) self.assertEqual(len(cs), 5) @@ -147,7 +147,7 @@ class TestControlledSchema(fixture.Pathed, fixture.DB): for i in range(10): self.repos.create_script('') - self.assertEquals(self.repos.latest, 10) + self.assertEqual(self.repos.latest, 10) dbschema.upgrade(10) diff --git a/migrate/tests/versioning/test_schemadiff.py b/migrate/tests/versioning/test_schemadiff.py index e935eb1..74714e2 100644 --- a/migrate/tests/versioning/test_schemadiff.py +++ b/migrate/tests/versioning/test_schemadiff.py @@ -3,7 +3,6 @@ import os from sqlalchemy import * -from nose.tools import eq_ from migrate.versioning import schemadiff @@ -27,12 +26,12 @@ class SchemaDiffBase(fixture.DB): diff = self._run_diff() # print diff self.assertTrue(diff) - eq_(1,len(diff.tables_different)) + self.assertEqual(1,len(diff.tables_different)) td = diff.tables_different.values()[0] - eq_(1,len(td.columns_different)) + self.assertEqual(1,len(td.columns_different)) cd = td.columns_different.values()[0] label_width = max(len(self.name1), len(self.name2)) - eq_(('Schema diffs:\n' + self.assertEqual(('Schema diffs:\n' ' table with differences: xtable\n' ' column with differences: data\n' ' %*s: %r\n' @@ -59,7 +58,7 @@ class Test_getDiffOfModelAgainstDatabase(SchemaDiffBase): self._make_table(create=False) diff = self._run_diff() self.assertTrue(diff) - eq_('Schema diffs:\n tables missing from %s: xtable' % self.name2, + self.assertEqual('Schema diffs:\n tables missing from %s: xtable' % self.name2, str(diff)) @fixture.usedb() @@ -68,7 +67,7 @@ class Test_getDiffOfModelAgainstDatabase(SchemaDiffBase): self.meta.clear() diff = self._run_diff() self.assertTrue(diff) - eq_('Schema diffs:\n tables missing from %s: xtable' % self.name1, + self.assertEqual('Schema diffs:\n tables missing from %s: xtable' % self.name1, str(diff)) @fixture.usedb() @@ -86,7 +85,7 @@ class Test_getDiffOfModelAgainstDatabase(SchemaDiffBase): # run diff diff = self._run_diff() self.assertTrue(diff) - eq_('Schema diffs:\n' + self.assertEqual('Schema diffs:\n' ' table with differences: xtable\n' ' %s missing these columns: xcol' % self.name2, str(diff)) @@ -105,7 +104,7 @@ class Test_getDiffOfModelAgainstDatabase(SchemaDiffBase): # run diff diff = self._run_diff() self.assertTrue(diff) - eq_('Schema diffs:\n' + self.assertEqual('Schema diffs:\n' ' table with differences: xtable\n' ' %s missing these columns: xcol' % self.name1, str(diff)) @@ -134,14 +133,14 @@ class Test_getDiffOfModelAgainstDatabase(SchemaDiffBase): # ztable identical on both # ...so we expect no diff! self.assertFalse(diff) - eq_('No schema diffs',str(diff)) + self.assertEqual('No schema diffs',str(diff)) @fixture.usedb() def test_identical_just_pk(self): self._make_table() diff = self._run_diff() self.assertFalse(diff) - eq_('No schema diffs',str(diff)) + self.assertEqual('No schema diffs',str(diff)) @fixture.usedb() @@ -192,7 +191,7 @@ class Test_getDiffOfModelAgainstDatabase(SchemaDiffBase): Column('data', Integer()), ) diff = self._run_diff() - eq_('No schema diffs',str(diff)) + self.assertEqual('No schema diffs',str(diff)) self.assertFalse(diff) @fixture.usedb() @@ -201,7 +200,7 @@ class Test_getDiffOfModelAgainstDatabase(SchemaDiffBase): Column('data', String(10)), ) diff = self._run_diff() - eq_('No schema diffs',str(diff)) + self.assertEqual('No schema diffs',str(diff)) self.assertFalse(diff) @fixture.usedb() @@ -210,7 +209,7 @@ class Test_getDiffOfModelAgainstDatabase(SchemaDiffBase): Column('data', Text), ) diff = self._run_diff() - eq_('No schema diffs',str(diff)) + self.assertEqual('No schema diffs',str(diff)) self.assertFalse(diff) class Test_getDiffOfModelAgainstModel(Test_getDiffOfModelAgainstDatabase): diff --git a/migrate/tests/versioning/test_script.py b/migrate/tests/versioning/test_script.py index 53ef929..b52ddaa 100644 --- a/migrate/tests/versioning/test_script.py +++ b/migrate/tests/versioning/test_script.py @@ -126,7 +126,7 @@ def upgrade(migrate_engine): pyscript = self.cls(path) SQL = pyscript.preview_sql(self.url, 1) - self.assertEqualsIgnoreWhitespace(""" + self.assertEqualIgnoreWhitespace(""" CREATE TABLE "Link" ("link1ID" INTEGER, "link2ID" INTEGER, diff --git a/migrate/tests/versioning/test_shell.py b/migrate/tests/versioning/test_shell.py index 4b89c28..0bf5e22 100644 --- a/migrate/tests/versioning/test_shell.py +++ b/migrate/tests/versioning/test_shell.py @@ -7,7 +7,6 @@ import tempfile from cStringIO import StringIO from sqlalchemy import MetaData, Table -from nose.plugins.skip import SkipTest from migrate.exceptions import * from migrate.versioning.repository import Repository @@ -48,7 +47,7 @@ class TestShellCommands(Shell): def test_main_with_runpy(self): if sys.version_info[:2] == (2, 4): - raise SkipTest("runpy is not part of python2.4") + self.skipTest("runpy is not part of python2.4") from runpy import run_module try: original = sys.argv @@ -271,50 +270,50 @@ class TestShellDatabase(Shell, DB): repos_name = 'repos_name' repos_path = self.tmp() result = self.env.run('migrate create %(repos_path)s %(repos_name)s' % locals()) - self.assertEquals(self.run_version(repos_path), 0) + self.assertEqual(self.run_version(repos_path), 0) # Version the DB result = self.env.run('migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True) result = self.env.run('migrate version_control %s %s' % (self.url, repos_path)) # Upgrades with latest version == 0 - self.assertEquals(self.run_db_version(self.url, repos_path), 0) + self.assertEqual(self.run_db_version(self.url, repos_path), 0) result = self.env.run('migrate upgrade %s %s' % (self.url, repos_path)) - self.assertEquals(self.run_db_version(self.url, repos_path), 0) + self.assertEqual(self.run_db_version(self.url, repos_path), 0) result = self.env.run('migrate upgrade %s %s' % (self.url, repos_path)) - self.assertEquals(self.run_db_version(self.url, repos_path), 0) + self.assertEqual(self.run_db_version(self.url, repos_path), 0) result = self.env.run('migrate upgrade %s %s 1' % (self.url, repos_path), expect_error=True) - self.assertEquals(result.returncode, 1) + self.assertEqual(result.returncode, 1) result = self.env.run('migrate upgrade %s %s -1' % (self.url, repos_path), expect_error=True) - self.assertEquals(result.returncode, 2) + self.assertEqual(result.returncode, 2) # Add a script to the repository; upgrade the db result = self.env.run('migrate script Desc --repository=%s' % (repos_path)) - self.assertEquals(self.run_version(repos_path), 1) - self.assertEquals(self.run_db_version(self.url, repos_path), 0) + self.assertEqual(self.run_version(repos_path), 1) + self.assertEqual(self.run_db_version(self.url, repos_path), 0) # Test preview result = self.env.run('migrate upgrade %s %s 0 --preview_sql' % (self.url, repos_path)) result = self.env.run('migrate upgrade %s %s 0 --preview_py' % (self.url, repos_path)) result = self.env.run('migrate upgrade %s %s' % (self.url, repos_path)) - self.assertEquals(self.run_db_version(self.url, repos_path), 1) + 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.assertEquals(result.returncode, 2) + self.assertEqual(result.returncode, 2) result = self.env.run('migrate downgrade %s %s -1' % (self.url, repos_path), expect_error=True) - self.assertEquals(result.returncode, 2) + self.assertEqual(result.returncode, 2) result = self.env.run('migrate downgrade %s %s 2' % (self.url, repos_path), expect_error=True) - self.assertEquals(result.returncode, 2) - self.assertEquals(self.run_db_version(self.url, repos_path), 1) + 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.assertEquals(self.run_db_version(self.url, repos_path), 0) + 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.assertEquals(result.returncode, 2) - self.assertEquals(self.run_db_version(self.url, repos_path), 0) + self.assertEqual(result.returncode, 2) + self.assertEqual(self.run_db_version(self.url, repos_path), 0) result = self.env.run('migrate drop_version_control %s %s' % (self.url, repos_path)) @@ -326,26 +325,26 @@ class TestShellDatabase(Shell, DB): result = self.env.run('migrate create %s %s' % (repos_path, repos_name)) result = self.env.run('migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True) result = self.env.run('migrate version_control %s %s' % (self.url, repos_path)) - self.assertEquals(self.run_version(repos_path), 0) - self.assertEquals(self.run_db_version(self.url, repos_path), 0) + self.assertEqual(self.run_version(repos_path), 0) + self.assertEqual(self.run_db_version(self.url, repos_path), 0) beforeCount = len(os.listdir(os.path.join(repos_path, 'versions'))) # hmm, this number changes sometimes based on running from svn result = self.env.run('migrate script_sql %s --repository=%s' % ('postgres', repos_path)) - self.assertEquals(self.run_version(repos_path), 1) - self.assertEquals(len(os.listdir(os.path.join(repos_path, 'versions'))), beforeCount + 2) + self.assertEqual(self.run_version(repos_path), 1) + self.assertEqual(len(os.listdir(os.path.join(repos_path, 'versions'))), beforeCount + 2) open('%s/versions/001_postgres_upgrade.sql' % repos_path, 'a').write(upgrade_script) open('%s/versions/001_postgres_downgrade.sql' % repos_path, 'a').write(downgrade_script) - self.assertEquals(self.run_db_version(self.url, repos_path), 0) + self.assertEqual(self.run_db_version(self.url, repos_path), 0) self.assertRaises(Exception, self.engine.text('select * from t_table').execute) result = self.env.run('migrate upgrade %s %s' % (self.url, repos_path)) - self.assertEquals(self.run_db_version(self.url, repos_path), 1) + self.assertEqual(self.run_db_version(self.url, repos_path), 1) self.engine.text('select * from t_table').execute() result = self.env.run('migrate downgrade %s %s 0' % (self.url, repos_path)) - self.assertEquals(self.run_db_version(self.url, repos_path), 0) + self.assertEqual(self.run_db_version(self.url, repos_path), 0) self.assertRaises(Exception, self.engine.text('select * from t_table').execute) # The tests below are written with some postgres syntax, but the stuff @@ -387,14 +386,14 @@ class TestShellDatabase(Shell, DB): result = self.env.run('migrate create repository_name --repository=%s' % repos_path) result = self.env.run('migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True) result = self.env.run('migrate version_control %s %s' % (self.url, repos_path)) - self.assertEquals(self.run_version(repos_path), 0) - self.assertEquals(self.run_db_version(self.url, repos_path), 0) + self.assertEqual(self.run_version(repos_path), 0) + self.assertEqual(self.run_db_version(self.url, repos_path), 0) # Empty script should succeed result = self.env.run('migrate script Desc %s' % repos_path) result = self.env.run('migrate test %s %s' % (self.url, repos_path)) - self.assertEquals(self.run_version(repos_path), 1) - self.assertEquals(self.run_db_version(self.url, repos_path), 0) + self.assertEqual(self.run_version(repos_path), 1) + self.assertEqual(self.run_db_version(self.url, repos_path), 0) # Error script should fail script_path = self.tmp_py() @@ -416,8 +415,8 @@ class TestShellDatabase(Shell, DB): result = self.env.run('migrate test %s %s bla' % (self.url, repos_path), expect_error=True) self.assertEqual(result.returncode, 2) - self.assertEquals(self.run_version(repos_path), 1) - self.assertEquals(self.run_db_version(self.url, repos_path), 0) + self.assertEqual(self.run_version(repos_path), 1) + self.assertEqual(self.run_db_version(self.url, repos_path), 0) # Nonempty script using migrate_engine should succeed script_path = self.tmp_py() @@ -446,8 +445,8 @@ class TestShellDatabase(Shell, DB): file.write(script_text) file.close() result = self.env.run('migrate test %s %s' % (self.url, repos_path)) - self.assertEquals(self.run_version(repos_path), 1) - self.assertEquals(self.run_db_version(self.url, repos_path), 0) + 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): @@ -468,8 +467,8 @@ class TestShellDatabase(Shell, DB): result = self.env.run('migrate create %s %s' % (repos_path, repos_name)) result = self.env.run('migrate drop_version_control %s %s' % (self.url, repos_path), expect_error=True) result = self.env.run('migrate version_control %s %s' % (self.url, repos_path)) - self.assertEquals(self.run_version(repos_path), 0) - self.assertEquals(self.run_db_version(self.url, repos_path), 0) + self.assertEqual(self.run_version(repos_path), 0) + self.assertEqual(self.run_db_version(self.url, repos_path), 0) # Setup helper script. result = self.env.run('migrate manage %s --repository=%s --url=%s --model=%s'\ @@ -491,8 +490,8 @@ class TestShellDatabase(Shell, DB): # Update db to latest model. result = self.env.run('migrate update_db_from_model %s %s %s'\ % (self.url, repos_path, model_module)) - self.assertEquals(self.run_version(repos_path), 0) - self.assertEquals(self.run_db_version(self.url, repos_path), 0) # version did not get bumped yet because new version not yet created + self.assertEqual(self.run_version(repos_path), 0) + self.assertEqual(self.run_db_version(self.url, repos_path), 0) # version did not get bumped yet because new version not yet created result = self.env.run('migrate compare_model_to_db %s %s %s'\ % (self.url, repos_path, model_module)) @@ -520,7 +519,7 @@ class TestShellDatabase(Shell, DB): #result_script = self.env.run('migrate make_update_script_for_model %s %s %s %s'\ #% (self.url, repos_path, old_model_module, model_module)) - #self.assertEqualsIgnoreWhitespace(result_script.stdout, + #self.assertEqualIgnoreWhitespace(result_script.stdout, #'''from sqlalchemy import * #from migrate import * diff --git a/migrate/tests/versioning/test_util.py b/migrate/tests/versioning/test_util.py index 6b22b7a..b6b1490 100644 --- a/migrate/tests/versioning/test_util.py +++ b/migrate/tests/versioning/test_util.py @@ -24,11 +24,11 @@ class TestUtil(fixture.Pathed): # keyword arg engine = construct_engine(url, engine_arg_encoding='utf-8') - self.assertEquals(engine.dialect.encoding, 'utf-8') + self.assertEqual(engine.dialect.encoding, 'utf-8') # dict engine = construct_engine(url, engine_dict={'encoding': 'utf-8'}) - self.assertEquals(engine.dialect.encoding, 'utf-8') + self.assertEqual(engine.dialect.encoding, 'utf-8') # engine parameter engine_orig = create_engine('sqlite://') @@ -38,7 +38,7 @@ class TestUtil(fixture.Pathed): # test precedance engine = construct_engine(url, engine_dict={'encoding': 'iso-8859-1'}, engine_arg_encoding='utf-8') - self.assertEquals(engine.dialect.encoding, 'utf-8') + self.assertEqual(engine.dialect.encoding, 'utf-8') # deprecated echo=True parameter try: diff --git a/migrate/tests/versioning/test_version.py b/migrate/tests/versioning/test_version.py index 253642f..436d5f9 100644 --- a/migrate/tests/versioning/test_version.py +++ b/migrate/tests/versioning/test_version.py @@ -76,14 +76,14 @@ class TestVersion(fixture.Pathed): super(TestVersion, self).setUp() def test_str_to_filename(self): - self.assertEquals(str_to_filename(''), '') - self.assertEquals(str_to_filename('__'), '_') - self.assertEquals(str_to_filename('a'), 'a') - self.assertEquals(str_to_filename('Abc Def'), 'Abc_Def') - self.assertEquals(str_to_filename('Abc "D" Ef'), 'Abc_D_Ef') - self.assertEquals(str_to_filename("Abc's Stuff"), 'Abc_s_Stuff') - self.assertEquals(str_to_filename("a b"), 'a_b') - self.assertEquals(str_to_filename("a.b to c"), 'a_b_to_c') + self.assertEqual(str_to_filename(''), '') + self.assertEqual(str_to_filename('__'), '_') + self.assertEqual(str_to_filename('a'), 'a') + self.assertEqual(str_to_filename('Abc Def'), 'Abc_Def') + self.assertEqual(str_to_filename('Abc "D" Ef'), 'Abc_D_Ef') + self.assertEqual(str_to_filename("Abc's Stuff"), 'Abc_s_Stuff') + self.assertEqual(str_to_filename("a b"), 'a_b') + self.assertEqual(str_to_filename("a.b to c"), 'a_b_to_c') def test_collection(self): """Let's see how we handle versions collection""" @@ -142,19 +142,19 @@ class TestVersion(fixture.Pathed): open(filepath, 'w').close() ver = Version(1, path, [sqlite_upgrade_file]) - self.assertEquals(os.path.basename(ver.script('sqlite', 'upgrade').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.assertEquals(os.path.basename(ver.script('default', 'upgrade').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.assertEquals(os.path.basename(ver.script('sqlite', 'upgrade').path), sqlite_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.assertEquals(os.path.basename(ver.script('postgres', 'upgrade').path), default_upgrade_file) + self.assertEqual(os.path.basename(ver.script('postgres', 'upgrade').path), default_upgrade_file) ver = Version(1, path, [sqlite_upgrade_file, python_file]) - self.assertEquals(os.path.basename(ver.script('postgres', 'upgrade').path), python_file) + self.assertEqual(os.path.basename(ver.script('postgres', 'upgrade').path), python_file) def test_bad_version(self): ver = Version(1, self.temp_usable_dir, []) |