Catalog test fixes

Author: rambleraptor

pyiceberg/catalog/rest/__init__.py

@@ -790,7 +790,7 @@ def _create_table(
         if location:
             location = location.rstrip("/")
         request = CreateTableRequest(
-            name=namespace_and_table["table"],
+            name=self._identifier_to_validated_tuple(identifier)[-1],
             location=location,
             table_schema=fresh_schema,
             partition_spec=fresh_partition_spec,
@@ -869,7 +869,7 @@ def register_table(self, identifier: str | Identifier, metadata_location: str) -
         self._check_endpoint(Capability.V1_REGISTER_TABLE)
         namespace_and_table = self._split_identifier_for_path(identifier)
         request = RegisterTableRequest(
-            name=namespace_and_table["table"],
+            name=self._identifier_to_validated_tuple(identifier)[-1],
             metadata_location=metadata_location,
         )
         serialized_json = request.model_dump_json().encode(UTF8)

tests/integration/test_catalog.py

@@ -637,6 +637,7 @@ def test_rest_custom_namespace_separator(rest_catalog: RestCatalog, table_schema
     loaded_table = rest_catalog.load_table(identifier=full_table_identifier_tuple)
     assert loaded_table.name() == full_table_identifier_tuple
 
+
 def _namespace_exists(catalog: Catalog, namespace: str | Identifier) -> bool:
     try:
         catalog.load_namespace_properties(namespace)
@@ -648,7 +649,7 @@ def _namespace_exists(catalog: Catalog, namespace: str | Identifier) -> bool:
 @pytest.mark.integration
 @pytest.mark.parametrize("test_catalog", CATALOGS)
 def test_namespace_with_slash(test_catalog: Catalog) -> None:
-    if isinstance(test_catalog, (HiveCatalog, SqlCatalog, RestCatalog)):
+    if isinstance(test_catalog, HiveCatalog):
         pytest.skip(f"{type(test_catalog).__name__} does not support slash in namespace")
 
     namespace = ("new/db",)
@@ -671,7 +672,7 @@ def test_namespace_with_slash(test_catalog: Catalog) -> None:
 @pytest.mark.integration
 @pytest.mark.parametrize("test_catalog", CATALOGS)
 def test_namespace_with_dot(test_catalog: Catalog) -> None:
-    if isinstance(test_catalog, (HiveCatalog, SqlCatalog, RestCatalog)):
+    if isinstance(test_catalog, (HiveCatalog, SqlCatalog)):
         pytest.skip(f"{type(test_catalog).__name__} does not support dot in namespace")
 
     namespace = ("new.db",)
@@ -685,7 +686,11 @@ def test_namespace_with_dot(test_catalog: Catalog) -> None:
     assert _namespace_exists(test_catalog, namespace)
 
     # list_namespaces returns a list of tuples
-    assert namespace in test_catalog.list_namespaces()
+    if isinstance(test_catalog, RestCatalog):
+        namespaces = test_catalog.list_namespaces()
+        assert ("new",) in namespaces or ("new.db",) in namespaces
+    else:
+        assert namespace in test_catalog.list_namespaces()
 
     properties = test_catalog.load_namespace_properties(namespace)
     assert properties is not None
@@ -697,7 +702,7 @@ def test_namespace_with_dot(test_catalog: Catalog) -> None:
 @pytest.mark.integration
 @pytest.mark.parametrize("test_catalog", CATALOGS)
 def test_table_name_with_slash(test_catalog: Catalog, table_schema_simple: Schema) -> None:
-    if isinstance(test_catalog, (HiveCatalog, SqlCatalog, RestCatalog)):
+    if isinstance(test_catalog, (HiveCatalog, SqlCatalog)):
         pytest.skip(f"{type(test_catalog).__name__} does not support slash in table name")
 
     namespace = ("ns_slash",)
@@ -724,7 +729,7 @@ def test_table_name_with_slash(test_catalog: Catalog, table_schema_simple: Schem
 @pytest.mark.integration
 @pytest.mark.parametrize("test_catalog", CATALOGS)
 def test_table_name_with_dot(test_catalog: Catalog, table_schema_simple: Schema) -> None:
-    if isinstance(test_catalog, (HiveCatalog, SqlCatalog, RestCatalog)):
+    if isinstance(test_catalog, (HiveCatalog, SqlCatalog)):
         pytest.skip(f"{type(test_catalog).__name__} does not support dot in table name")
 
     namespace = ("ns_dot",)