Addressed test issues

Author: FastLee

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

@@ -386,16 +386,18 @@ def _convert_wasbs_table_to_abfss(self, src_table: Table) -> bool:
         inventory_table = self._tables_crawler.full_name
         database = self._spark._jvm.scala.Some(src_table.database)  # pylint: disable=protected-access
         table_identifier = self._table_identifier(src_table.name, database)
+        new_table_location = ExternalLocations.wasbs_to_abfss(src_table.location)
+        if not new_table_location:
+            logger.warning(f"Invalid wasbs location for table {src_table.name}, skipping conversion.")
+            return False
         try:
             old_table = self._catalog.getTableMetadata(table_identifier)
             entity_storage_locations = self._get_entity_storage_locations(old_table)
             table_location = old_table.storage()
-            new_table_location = self._spark._jvm.java.net.URI(  # pylint: disable=protected-access
-                ExternalLocations.wasbs_to_abfss(src_table.location)
-            )
             new_location = self._catalog_storage(
-                self._spark._jvm.scala.Some(new_table_location),  # pylint: disable=protected-access
-                table_location.inputFormat(),
+                self._spark._jvm.scala.Some(  # pylint: disable=protected-access
+                    self._spark._jvm.java.net.URI(new_table_location)  # pylint: disable=protected-access
+                ),
                 table_location.outputFormat(),
                 table_location.serde(),
                 table_location.compressed(),
@@ -431,7 +433,7 @@ def _convert_wasbs_table_to_abfss(self, src_table: Table) -> bool:
         except Exception as e:  # pylint: disable=broad-exception-caught
             logger.warning(f"Error converting HMS table {src_table.name} to abfss: {e}", exc_info=True)
             return False
-        self._update_table_location(src_table, inventory_table, new_table_location.toString())
+        self._update_table_location(src_table, inventory_table, new_table_location)
         logger.info(f"Converted {src_table.name} to External Table type.")
         return True
 

tests/unit/hive_metastore/test_table_migrate.py

@@ -242,7 +242,9 @@ def test_convert_wasbs_to_adls_gen2(ws, mock_pyspark):
     table_migrate.convert_wasbs_to_adls_gen2()
     migrate_grants.apply.assert_not_called()
     external_locations.resolve_mount.assert_not_called()
-    assert backend.queries[0].startswith("UPDATE `hive_metastore`.`inventory_database`.`tables` SET location =")
+    assert backend.queries == [
+        "UPDATE `hive_metastore`.`inventory_database`.`tables` SET location = 'abfss://bucket/test/table1' WHERE catalog='hive_metastore' AND database='db1_src' AND name='wasbs_src';"
+    ]
 
 
 def test_migrate_managed_table_as_external_tables_without_conversion(ws, mock_pyspark):