From 60ae07c34f85dd457fad5ac797fa9a3f9d6340ca Mon Sep 17 00:00:00 2001
From: bmc-msft <41130664+bmc-msft@users.noreply.github.com>
Date: Wed, 2 Jun 2021 11:11:33 -0400
Subject: [PATCH] handle azure-storage deleting nonexistent containers (#948)

---
 .../__app__/onefuzzlib/azure/containers.py           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/api-service/__app__/onefuzzlib/azure/containers.py b/src/api-service/__app__/onefuzzlib/azure/containers.py
index 0c5394765..3ec8c265c 100644
--- a/src/api-service/__app__/onefuzzlib/azure/containers.py
+++ b/src/api-service/__app__/onefuzzlib/azure/containers.py
@@ -10,7 +10,7 @@ import urllib.parse
 from typing import Dict, Optional, Union, cast
 
 from azure.common import AzureHttpError, AzureMissingResourceHttpError
-from azure.core.exceptions import ResourceExistsError
+from azure.core.exceptions import ResourceExistsError, ResourceNotFoundError
 from azure.storage.blob import (
     BlobClient,
     BlobSasPermissions,
@@ -146,12 +146,16 @@ def create_container(
 
 def delete_container(container: Container, storage_type: StorageType) -> bool:
     accounts = get_accounts(storage_type)
+    deleted = False
     for account in accounts:
         service = get_blob_service(account)
-        if bool(service.delete_container(container)):
-            return True
+        try:
+            service.delete_container(container)
+            deleted = True
+        except ResourceNotFoundError:
+            pass
 
-    return False
+    return deleted
 
 
 def get_container_sas_url_service(