Format

Author: JCZuurmond

src/databricks/labs/ucx/hive_metastore/catalog_schema.py

@@ -129,7 +129,9 @@ def _get_database_source_target_mapping(self) -> dict[str, list[SchemaInfo]]:
                 src_trg_schema_mapping[table_mapping.src_schema].append(schema)
         return src_trg_schema_mapping
 
-    def _create_catalog_validate(self, catalog_name: str, prompts: Prompts, *, properties: dict[str, str] | None) -> None:
+    def _create_catalog_validate(
+        self, catalog_name: str, prompts: Prompts, *, properties: dict[str, str] | None
+    ) -> None:
         try:
             catalog = self._ws.catalogs.get(catalog_name)
         except NotFound:

tests/unit/hive_metastore/test_catalog_schema.py

@@ -16,10 +16,12 @@
 
 def prepare_test(ws, backend: MockBackend | None = None) -> CatalogSchema:
     ws.catalogs.list.return_value = [CatalogInfo(name="catalog1")]
+
     def get_catalog(catalog_name: str) -> CatalogInfo | None:
         if catalog_name == "catalog1":
             return CatalogInfo(name="catalog1")
         return None
+
     ws.catalogs.get.side_effect = get_catalog
 
     def raise_catalog_exists(catalog: str, *_, **__) -> None:
@@ -155,7 +157,15 @@ def raise_catalog_exists(catalog: str, *_, **__) -> None:
     assert "Skipping already existing catalog: ucx" in caplog.text
 
 
-@pytest.mark.parametrize("location", ["s3://foo/bar", "s3://foo/bar/test", "s3://foo/bar/test/baz", "abfss://container@storageaccount.dfs.core.windows.net"])
+@pytest.mark.parametrize(
+    "location",
+    [
+        "s3://foo/bar",
+        "s3://foo/bar/test",
+        "s3://foo/bar/test/baz",
+        "abfss://container@storageaccount.dfs.core.windows.net",
+    ],
+)
 def test_create_all_catalogs_schemas_creates_catalogs(location: str) -> None:
     """Catalog 2-4 should be created; catalog 1 already exists."""
     ws = create_autospec(WorkspaceClient)
@@ -175,11 +185,13 @@ def test_create_all_catalogs_schemas_creates_catalogs(location: str) -> None:
 def test_create_all_catalogs_schemas_creates_catalogs_with_different_locations() -> None:
     """Catalog 2-4 should be created; catalog 1 already exists."""
     ws = create_autospec(WorkspaceClient)
-    mock_prompts = MockPrompts({
-        "Please provide storage location url for catalog: catalog2": "s3://foo/bar",
-        "Please provide storage location url for catalog: catalog3": "s3://foo/bar/test",
-        "Please provide storage location url for catalog: catalog4": "s3://foo/bar/test/baz",
-    })
+    mock_prompts = MockPrompts(
+        {
+            "Please provide storage location url for catalog: catalog2": "s3://foo/bar",
+            "Please provide storage location url for catalog: catalog3": "s3://foo/bar/test",
+            "Please provide storage location url for catalog: catalog4": "s3://foo/bar/test/baz",
+        }
+    )
 
     catalog_schema = prepare_test(ws)
     catalog_schema.create_all_catalogs_schemas(mock_prompts)