Merge "Repair include_object to accommodate new objects"

This commit is contained in:
Jenkins 2014-11-28 09:22:03 +00:00 committed by Gerrit Code Review
commit 3d5a9b134f

@ -240,7 +240,10 @@ class ModelsMigrationSyncMixin(test.BaseTestCase):
self.metadata_migrations.create_all(bind=engine)
def include_object(self, object_, name, type_, reflected, compare_to):
return type_ == 'table' and name == 'testtbl' or type_ == 'column'
if type_ == 'table':
return name == 'testtbl'
else:
return True
def _test_models_not_sync(self):
self.metadata_migrations.clear()
@ -281,7 +284,7 @@ class ModelsMigrationSyncMixin(test.BaseTestCase):
'Models and migration scripts aren\'t in sync:'))
self.assertIn('testtbl', msg)
self.assertIn('spam', msg)
self.assertIn('eggs', msg)
self.assertIn('eggs', msg) # test that the unique constraint is added
self.assertIn('foo', msg)
self.assertIn('bar', msg)
self.assertIn('bool_wo_default', msg)