flaky fix, cleanup

Author: satvu

test/Resources/TestScripts/Node/CosmosDBInMultiple/function.json

@@ -15,11 +15,12 @@
         "sqlQuery": "SELECT * from c where c.text = {id}"
     },
     {
-      "type": "blob",
-      "name": "blob",
-      "connection": "AzureWebJobsStorage",
+      "type": "cosmosDB",
+      "name": "itemOut",
       "direction": "out",
-      "path": "test-output-node/cosmosdbin-multiple-e2e-completed"
+      "databaseName": "ItemDb",
+      "containerName": "ItemCollection",
+      "createIfNotExists": true
     }
   ]
 }

test/Resources/TestScripts/Node/CosmosDBInMultiple/index.js

@@ -6,7 +6,10 @@ module.exports = function (context, input) {
        throw Error("Expected 2 documents. Found " + context.bindings.items.length);
     }
 
-    context.bindings.blob = input.id;
+    context.bindings.itemOut = {
+        id: input.id,
+        text: "Hello from Node with multiple input bindings!"
+    };
 
     context.done();
 }

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

@@ -36,8 +36,11 @@ await Fixture.CosmosClient.GetContainer("ItemDb", "ItemCollection")
             string result = await TestHelpers.WaitForBlobAndGetStringAsync(resultBlob,
                 () => string.Join(Environment.NewLine, Fixture.Host.GetScriptHostLogMessages()));
 
-            // cleanup collections
-            await Fixture.DeleteContainers();
+            if (collectionsCreated)
+            {
+                // cleanup collections
+                await Fixture.DeleteContainers();
+            }
 
             Assert.False(string.IsNullOrEmpty(result));
         }
@@ -62,9 +65,6 @@ protected async Task CosmosDBTest()
 
             Assert.Equal(updatedDoc.id, doc.id);
             Assert.NotEqual(doc._etag, updatedDoc._etag);
-
-            // cleanup collections
-            await Fixture.DeleteContainers();
         }
 
         protected async Task CosmosDBMultipleItemsTest()
@@ -84,14 +84,8 @@ protected async Task CosmosDBMultipleItemsTest()
             string messageContent = string.Format("{{ \"id\": \"{0}\" }}", id);
             await queue.AddMessageAsync(new CloudQueueMessage(messageContent));
 
-            // now wait for function to be invoked
-            string result = await TestHelpers.WaitForBlobAndGetStringAsync(resultBlob,
-                () => string.Join(Environment.NewLine, Fixture.Host.GetScriptHostLogMessages()));
-
-            // cleanup collections
-            await Fixture.DeleteContainers();
-
-            Assert.False(string.IsNullOrEmpty(result));
+            // And wait for the text to be updated
+            dynamic updatedDoc = await WaitForItemAsync(id, "Hello from Node with multiple input bindings!");
         }
 
         protected async Task TestConnectToEmulator()

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

@@ -1,13 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
 using Microsoft.Azure.Cosmos;
 using Microsoft.Azure.WebJobs.Script.Models;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests.CosmosDB
 {

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

@@ -1,17 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.WebJobs.Script.Workers.Rpc;
 using System.Threading.Tasks;
+using Microsoft.Azure.WebJobs.Script.Workers.Rpc;
 using Xunit;
 
-// Add this outside the namespace or at the top of the file
-[CollectionDefinition("CosmosDBNodeEndToEndTests", DisableParallelization = true)]
-public class CosmosDBNodeEndToEndTestsCollection { }
-
 namespace Microsoft.Azure.WebJobs.Script.Tests.CosmosDB
 {
-    [Collection("CosmosDBNodeEndToEndTests")]
     public class CosmosDBNodeEndToEndTests :
         CosmosDBEndToEndTestsBase<CosmosDBNodeEndToEndTests.TestFixture>
     {

test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestFixture.cs

@@ -44,9 +44,6 @@ public abstract class EndToEndTestFixture : IAsyncLifetime
         private string _functionsWorkerRuntimeVersion;
         private bool _addTestSettings;
 
-        [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification = "Well known account key for emulator. Used for testing.")]
-        private string CosmosDBConnectionString = "AccountEndpoint=https://localhost:8081/;AccountKey=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
-
         protected EndToEndTestFixture(
             string rootPath,
             string testId,
@@ -170,8 +167,7 @@ string GetDestPath(int counter)
                     configBuilder.AddInMemoryCollection(new Dictionary<string, string>
                     {
                         { "AzureWebJobsStorage", azuriteConnectionString },
-                        { "ConnectionStrings:AzureWebJobsStorage", azuriteConnectionString },
-                        { "ConnectionStrings:CosmosDB", CosmosDBConnectionString}
+                        { "ConnectionStrings:AzureWebJobsStorage", azuriteConnectionString }
                     });
 
                     ConfigureScriptHost(configBuilder);
@@ -182,7 +178,6 @@ string GetDestPath(int counter)
 
                     // Flow this env variable to out of proc workers.
                     s.Configure<FunctionsHostingConfigOptions>(o => o.Features["AzureWebJobsStorage"] = azuriteConnectionString);
-                    s.Configure<FunctionsHostingConfigOptions>(o => o.Features["ConnectionStrings:CosmosDB"] = CosmosDBConnectionString);
                     ConfigureWebHost(s);
                 },
                 configureWebHostAppConfiguration: configBuilder =>