test again

Author: satvu

test/WebJobs.Script.Tests.Integration/CosmosDB/CosmosDBEndToEndTestsBase.cs

@@ -5,7 +5,6 @@
 using Microsoft.Azure.Storage.Queue;
 using System;
 using System.Threading.Tasks;
-using System.Xml.Linq;
 using Xunit;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests.CosmosDB
@@ -23,10 +22,9 @@ public CosmosDBEndToEndTestsBase(TTestFixture fixture) : base(fixture)
         protected async Task CosmosDBTriggerToBlobTest()
         {
             // Waiting for the Processor to acquire leases
-            await Task.Delay(5000);
+            await Task.Delay(10000);
 
             var dbName = "TriggerItemDb";
-            await SetUpTriggerListener();
 
             var resultBlob = _fixture.TestOutputContainer.GetBlockBlobReference("cosmosdbtriggere2e-completed");
             await resultBlob.DeleteIfExistsAsync();
@@ -44,14 +42,13 @@ await _fixture.CosmosClient.GetContainer(dbName, "ItemCollection")
 
             Assert.False(string.IsNullOrEmpty(result));
 
-            await _fixture.DeleteCosmosDbResources(dbName);
+            await resultBlob.DeleteIfExistsAsync();
         }
 
         protected async Task CosmosDBTest()
         {
             var dbName = "InOutItemDb";
             await _fixture.CreateContainers(dbName);
-            await SetUpTriggerListener();
 
             string id = Guid.NewGuid().ToString();
             await _fixture.Host.BeginFunctionAsync("CosmosDBOut", id);
@@ -76,7 +73,6 @@ protected async Task CosmosDBMultipleItemsTest()
         {
             var dbName = "MultipleInOutItemDb";
             await _fixture.CreateContainers(dbName);
-            await SetUpTriggerListener();
 
             string id = Guid.NewGuid().ToString();
             await _fixture.Host.BeginFunctionAsync("CosmosDBOutMultiple", id);
@@ -133,18 +129,5 @@ await TestHelpers.Await(async () =>
 
             return document;
         }
-
-        // Regardless of which function is being tested, the trigger listener needs to be set up or the test host fails
-        private async Task SetUpTriggerListener()
-        {
-            var dbName = "TriggerItemDb";
-            bool collectionsCreated = await _fixture.CreateContainers(dbName);
-        }
-
-        private async Task RemoveTriggerDb()
-        {
-            var dbName = "TriggerItemDb";
-            await _fixture.DeleteCosmosDbResources(dbName);
-        }
     }
 }

test/WebJobs.Script.Tests.Integration/CosmosDB/CosmosDBEndtoEndTestFixture.cs

@@ -65,12 +65,14 @@ public void InitializeCosmosClient()
         public override async Task InitializeAsync()
         {
             InitializeCosmosClient();
+            await SetUpTriggerListener();
             await base.InitializeAsync();
         }
 
         public override async Task DisposeAsync()
         {
             await base.DisposeAsync();
+            await RemoveTriggerDb();
             CosmosClient?.Dispose();
         }
 
@@ -110,5 +112,18 @@ public async Task DeleteCosmosDbResources(string dbName)
 
             await database.DeleteAsync();
         }
+
+        // Regardless of which function is being tested, the trigger listener needs to be set up or the test host fails
+        private async Task SetUpTriggerListener()
+        {
+            var dbName = "TriggerItemDb";
+            bool collectionsCreated = await CreateContainers(dbName);
+        }
+
+        private async Task RemoveTriggerDb()
+        {
+            var dbName = "TriggerItemDb";
+            await DeleteCosmosDbResources(dbName);
+        }
     }
 }