Fix tests
diff --git a/tests/integration_tests/db_engine_specs/presto_tests.py b/tests/integration_tests/db_engine_specs/presto_tests.py index 5c57611..8d3df76 100644 --- a/tests/integration_tests/db_engine_specs/presto_tests.py +++ b/tests/integration_tests/db_engine_specs/presto_tests.py
@@ -1215,10 +1215,10 @@ return with database.get_inspector() as inspector: - assert PrestoEngineSpec.get_catalog_names(database, inspector) == [ + assert PrestoEngineSpec.get_catalog_names(database, inspector) == { "jmx", "memory", "system", "tpcds", "tpch", - ] + }
diff --git a/tests/unit_tests/commands/databases/conftest.py b/tests/unit_tests/commands/databases/conftest.py index 81f489d..9e293b4 100644 --- a/tests/unit_tests/commands/databases/conftest.py +++ b/tests/unit_tests/commands/databases/conftest.py
@@ -44,10 +44,10 @@ database.database_name = "my_db" database.db_engine_spec.__name__ = "test_engine" database.db_engine_spec.supports_catalog = True - database.get_all_catalog_names.return_value = ["catalog1", "catalog2"] + database.get_all_catalog_names.return_value = {"catalog1", "catalog2"} database.get_all_schema_names.side_effect = [ - ["schema1", "schema2"], - ["schema3", "schema4"], + {"schema1", "schema2"}, + {"schema3", "schema4"}, ] database.get_default_catalog.return_value = "catalog2" @@ -63,7 +63,7 @@ database.database_name = "my_db" database.db_engine_spec.__name__ = "test_engine" database.db_engine_spec.supports_catalog = False - database.get_all_schema_names.return_value = ["schema1", "schema2"] + database.get_all_schema_names.return_value = {"schema1", "schema2"} database.is_oauth2_enabled.return_value = False database.db_engine_spec.needs_oauth2.return_value = False
diff --git a/tests/unit_tests/commands/databases/sync_permissions_test.py b/tests/unit_tests/commands/databases/sync_permissions_test.py index 78dfe3d..cc6a852 100644 --- a/tests/unit_tests/commands/databases/sync_permissions_test.py +++ b/tests/unit_tests/commands/databases/sync_permissions_test.py
@@ -69,23 +69,24 @@ add_pvm_mock.assert_has_calls( [ mocker.call( - db.session, security_manager, "catalog_access", "[my_db].[catalog2]" + db.session, security_manager, "catalog_access", "[my_db].[catalog1]" ), mocker.call( db.session, security_manager, "schema_access", - "[my_db].[catalog2].[schema3]", + "[my_db].[catalog1].[schema3]", ), mocker.call( db.session, security_manager, "schema_access", - "[my_db].[catalog2].[schema4]", + "[my_db].[catalog1].[schema4]", ), - ] + ], + any_order=True, ) - mock_refresh_schemas.assert_called_once_with("catalog1", ["schema1", "schema2"]) + mock_refresh_schemas.assert_called_once_with("catalog2", {"schema1", "schema2"}) mock_rename_db_perm.assert_not_called() @@ -246,7 +247,7 @@ Test the ``_get_catalog_names`` method. """ cmmd = SyncPermissionsCommand(1, None, db_connection=database_with_catalog) - assert cmmd._get_catalog_names() == ["catalog1", "catalog2"] + assert cmmd._get_catalog_names() == {"catalog1", "catalog2"} def test_sync_permissions_command_get_default_catalog(database_with_catalog: MagicMock): @@ -263,7 +264,7 @@ database_with_catalog.allow_multi_catalog = True cmmd = SyncPermissionsCommand(1, None, db_connection=database_with_catalog) - assert cmmd._get_catalog_names() == ["catalog1", "catalog2"] + assert cmmd._get_catalog_names() == {"catalog1", "catalog2"} @pytest.mark.parametrize( @@ -295,8 +296,8 @@ Test the ``_get_schema_names`` method. """ cmmd = SyncPermissionsCommand(1, None, db_connection=database_with_catalog) - assert cmmd._get_schema_names("catalog1") == ["schema1", "schema2"] - assert cmmd._get_schema_names("catalog2") == ["schema3", "schema4"] + assert cmmd._get_schema_names("catalog1") == {"schema1", "schema2"} + assert cmmd._get_schema_names("catalog2") == {"schema3", "schema4"} @pytest.mark.parametrize(