@@ -361,11 +361,6 @@ def test_upgrade_catalog_perms_graceful(
361361 def get_all_schema_names_mock (catalog = None ):
362362 raise Exception ("Failed to connect to the database" )
363363
364- mocker .patch .object (
365- database ,
366- "get_all_schema_names" ,
367- side_effect = get_all_schema_names_mock ,
368- )
369364 mocker .patch ("superset.migrations.shared.catalogs.op" , session )
370365
371366 database = Database (
@@ -376,6 +371,12 @@ def get_all_schema_names_mock(catalog=None):
376371 session .add (database )
377372 session .commit ()
378373
374+ mocker .patch .object (
375+ database ,
376+ "get_all_schema_names" ,
377+ side_effect = get_all_schema_names_mock ,
378+ )
379+
379380 # Create initial permissions for testing
380381 db_perm = ViewMenu (name = "[my_db].(id:1)" )
381382 table_perm = ViewMenu (name = "[my_db].[my_table](id:1)" )
@@ -688,12 +689,12 @@ def test_upgrade_catalog_perms_simplified_migration(
688689 TableSchema ,
689690 TabState ,
690691 )
692+ from superset .migrations .shared .security_converge import Base as SecurityBase
691693
692694 engine = session .get_bind ()
693695 Database .metadata .create_all (engine )
694- Permission .metadata .create_all (engine )
695- PermissionView .metadata .create_all (engine )
696- ViewMenu .metadata .create_all (engine )
696+
697+ SecurityBase .metadata .create_all (engine )
697698
698699 mocker .patch ("superset.migrations.shared.catalogs.op" )
699700 db = mocker .patch ("superset.migrations.shared.catalogs.db" )
0 commit comments