small fixes

Author: cmgrant-db

src/databricks/labs/pytester/fixtures/catalog.py

@@ -497,21 +497,19 @@ def create(
             schema_name = schema.name
 
         if not name:
-            name = f"dummy_vol_{make_random(6).lower()}"
+            name = f"dummy_v{make_random(6).lower()}"
 
         volume_info = ws.volumes.create(
             catalog_name=catalog_name,
             schema_name=schema_name,
             name=name,
             volume_type=VolumeType.MANAGED,
         )
-        if isinstance(volume_info, Mock):
-            volume_info.name = name
         path = f'explore/data/{volume_info.catalog_name}/{volume_info.schema_name}/{volume_info.name}'
         log_workspace_link(f'{volume_info.name} volume', path)
         return volume_info
 
     def remove(volume_info: VolumeInfo):
-        ws.volumes.delete(f"{volume_info.catalog_name}.{volume_info.schema_name}.{volume_info.name}", force=True)
+        ws.volumes.delete(f"{volume_info.catalog_name}.{volume_info.schema_name}.{volume_info.name}")
 
     yield from factory("volume", create, remove)

tests/unit/fixtures/test_catalog.py

@@ -1,6 +1,6 @@
 from unittest.mock import ANY
 
-from databricks.sdk.service.catalog import TableInfo, TableType, DataSourceFormat, FunctionInfo, SchemaInfo
+from databricks.sdk.service.catalog import TableInfo, TableType, DataSourceFormat, FunctionInfo, SchemaInfo, VolumeType, VolumeInfo
 
 from databricks.labs.pytester.fixtures.unwrap import call_stateful
 from databricks.labs.pytester.fixtures.catalog import (
@@ -160,21 +160,18 @@ def test_make_schema() -> None:
     )
 
 
-def test_make_volume():
+def test_make_volume_noargs():
     ctx, info = call_stateful(make_volume)
-
     ctx['ws'].volumes.create.assert_called_once()
-    print(info)
-    assert info.catalog_name is not None
-    assert info.schema_name is not None
-    assert info.name is not None
+    assert info is not None
 
 
 def test_make_volume_with_name():
     ctx, info = call_stateful(make_volume, name='test_volume')
-
-    ctx['ws'].volumes.create.assert_called_once()
-    assert info.catalog_name is not None
-    assert info.schema_name is not None
-    assert info.name == 'test_volume'
-
+    ctx['ws'].volumes.create.assert_called_once_with(
+        name='test_volume',
+        catalog_name="dummy_crandom", 
+        schema_name="dummy_srandom",
+        volume_type=VolumeType.MANAGED
+    )
+    assert info is not None