Minor test tweaks

Author: mathewc

src/WebJobs.Script/Host/ScriptHostManager.cs

@@ -86,7 +86,7 @@ public ScriptHost Instance
             while (!_stopped);
         }
 
-        // Let the existing host instance finsih currently executing functions.
+        // Let the existing host instance finish currently executing functions.
         private async Task Orphan(ScriptHost instance)
         {
             lock (_liveInstances)

test/WebJobs.Script.Tests/NodeEndToEndTests.cs

@@ -3,19 +3,21 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using Xunit;
-using System.Diagnostics;
 
 namespace WebJobs.Script.Tests
 {
     public class NodeEndToEndTests : EndToEndTestsBase<NodeEndToEndTests.TestFixture>
     {
+        private const string JobLogTestFileName = "joblog.txt";
+
         public NodeEndToEndTests(TestFixture fixture) : base(fixture)
         {
         }
@@ -144,39 +146,27 @@ public async Task WebHookTrigger_GenericJson()
         [Fact]
         public async Task TimerTrigger()
         {
-            var stopwatch = Stopwatch.StartNew();
-
-            while (true)
+            // job is running every second, so give it a few seconds to
+            // generate some output
+            await TestHelpers.Await(() =>
             {
-                // Time will write to this file. 
-                try
-                {
-                    string[] lines = File.ReadAllLines("joblog.txt");
-                    if (lines.Length > 2)
-                    {
-                        return;
-                    }
-                }
-                catch
+                if (File.Exists(JobLogTestFileName))
                 {
-                    // File may be missing if timer hasn't written yet. 
+                    string[] lines = File.ReadAllLines(JobLogTestFileName);
+                    return lines.Length > 2;
                 }
-
-                if (stopwatch.ElapsedMilliseconds > 6*1000)
+                else
                 {
-                    Assert.True(false, "Timeout waiting for timer to fire.");
+                    return false;
                 }
-
-                await Task.Delay(TimeSpan.FromSeconds(1));
-            }
-
+            }, timeout: 10 * 1000);
         }
 
         public class TestFixture : EndToEndTestFixture
         {
             public TestFixture() : base(@"TestScripts\Node")
             {
-                File.Delete("joblog.txt");
+                File.Delete(JobLogTestFileName);
             }
         }
     }

test/WebJobs.Script.Tests/ScriptHostManagerTests.cs

@@ -2,18 +2,12 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
+using System.Threading;
 using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-using Xunit;
-using System.Diagnostics;
 using Microsoft.Azure.WebJobs.Script;
-using System.Threading;
 using Microsoft.WindowsAzure.Storage.Blob;
+using Xunit;
 
 namespace WebJobs.Script.Tests
 {
@@ -30,7 +24,7 @@ public async Task UpdateFileAndRestart()
             CancellationTokenSource cts = new CancellationTokenSource();
 
             var fixture = new NodeEndToEndTests.TestFixture();
-            var blob1 = UpdateOutputName("outputblobname", "first", fixture);
+            var blob1 = UpdateOutputName("testblob", "first", fixture);
 
             await fixture.Host.StopAsync();
             var config = fixture.Host.ScriptConfig;            
@@ -41,13 +35,19 @@ public async Task UpdateFileAndRestart()
                 Thread t = new Thread(_ =>
                    {
                        // Wait for initial execution.
-                       Wait(blob1);
+                       TestHelpers.Await(() =>
+                       {
+                           return blob1.Exists();
+                       }, timeout: 10 * 1000).Wait();
 
                        // This changes the bindings so that we now write to blob2
                        var blob2 = UpdateOutputName("first", "second", fixture);
 
-                       // wait for newly executed 
-                       Wait(blob2);
+                       // wait for newly executed
+                       TestHelpers.Await(() =>
+                       {
+                           return blob2.Exists();
+                       }, timeout: 10 * 1000).Wait();
 
                        manager.Stop();
                    });
@@ -59,24 +59,6 @@ public async Task UpdateFileAndRestart()
             }
         }
 
-        // For a blob to appear. This is evidence that the function ran. 
-        void Wait(CloudBlockBlob blob)
-        {
-            Stopwatch sw = Stopwatch.StartNew();
-            const int timeoutMs = 10 * 1000; // 
-
-            while (!blob.Exists())
-            {
-                Thread.Sleep(500);
-                if (sw.ElapsedMilliseconds > timeoutMs)
-                {
-                    // If no blob appeared yet, then the function didn't run. 
-                    // It may have not picked up the new changes
-                    Assert.True(false, "Timeout waiting for blob to appear. " + timeoutMs + "ms");
-                }
-            }
-        }
-
         // Update the manifest for the timer function
         // - this will cause a file touch which cause ScriptHostManager to notice and update
         // - set to a new output location so that we can ensure we're getting new changes. 
@@ -92,7 +74,6 @@ static CloudBlockBlob UpdateOutputName(string prev, string hint, EndToEndTestFix
             var blob = fixture.TestContainer.GetBlockBlobReference(name);
             blob.DeleteIfExists();
             return blob;
-
         }
     }
 }

test/WebJobs.Script.Tests/TestScripts/Node/TimerTrigger/function.json

@@ -10,7 +10,7 @@
       {
         "type": "blob",
         "name": "output",
-        "path": "test-output/outputblobname"
+        "path": "test-output/testblob"
       }
     ]
   }

test/WebJobs.Script.Tests/TestScripts/Node/TimerTrigger/index.js

@@ -3,7 +3,7 @@
 module.exports = function (context) {
     var timeStamp = new Date().toISOString();    
     fs.appendFile('joblog.txt', timeStamp + '\r\n', function (err) {
-        var blobOutputContents = "from timer trigger: " + timeStamp;
+        var blobOutputContents = "From timer trigger: " + timeStamp;
         context.done(err, blobOutputContents);
     });
 }