tests: ignore 404 when double-checking bucket deletion

Author: Dani Reinón

Diff for: supabase/__init__.py

@@ -4,4 +4,5 @@
 from supabase.client import Client, create_client
 from supabase.lib.auth_client import SupabaseAuthClient
 from supabase.lib.realtime_client import SupabaseRealtimeClient
-from supabase.lib.storage_client import StorageFileAPI, SupabaseStorageClient
+from supabase.lib.storage import StorageException, StorageFileAPI
+from supabase.lib.storage_client import SupabaseStorageClient

Diff for: supabase/lib/__init__.py

@@ -1,3 +1,3 @@
-from supabase.lib import auth_client, realtime_client, storage_client
+from supabase.lib import auth_client, realtime_client, storage, storage_client
 
-__all__ = ["auth_client", "realtime_client", "storage_client"]
+__all__ = ["auth_client", "realtime_client", "storage_client", "storage"]

Diff for: supabase/lib/storage/__init__.py

@@ -0,0 +1,2 @@
+from .storage_bucket_api import StorageBucketAPI, StorageException
+from .storage_file_api import StorageFileAPI

Diff for: supabase/lib/storage/storage_bucket_api.py

@@ -7,7 +7,7 @@
 
 from httpx import AsyncClient, Client, HTTPError
 
-__all__ = ["Bucket", "StorageBucketAPI"]
+__all__ = ["Bucket", "StorageBucketAPI", "StorageException"]
 
 _RequestMethod = str
 

Diff for: tests/test_storage.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
-from time import sleep
 from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import pytest
 
+from supabase import StorageException
+
 if TYPE_CHECKING:
     from pathlib import Path
     from typing import Any, Callable, Dict, List
@@ -39,16 +40,21 @@ def delete_left_buckets(
     """Ensures no test buckets are left"""
 
     def finalizer():
-        # Sleep 15 seconds in order to let buckets be deleted before the double-check
-        sleep(15)
         buckets_list = storage_client.list_buckets()
         if not buckets_list:
             return
 
         for bucket in buckets_list:
             if bucket.id.startswith(UUID_PREFIX):
-                storage_client.empty_bucket(bucket.id)
-                storage_client.delete_bucket(bucket.id)
+                try:
+                    storage_client.empty_bucket(bucket.id)
+                    storage_client.delete_bucket(bucket.id)
+                except StorageException as e:
+                    # Ignore 404 responses since they mean the bucket was already deleted
+                    response = e.args[0]
+                    if response["status_code"] != 404:
+                        raise e
+                    continue
 
     request.addfinalizer(finalizer)