Fixing flaky/skipped blob trigger test (#386)

Author: mathewc

test/WebJobs.Script.Tests/BashEndToEndTests.cs

@@ -15,28 +15,42 @@ public BashEndToEndTests(TestFixture fixture)
         {
         }
 
-        [Fact(Skip = "Flaky test. Need to fix")]
+        [Fact]
         public async Task BlobTriggerToBlobTest()
         {
-            string name = Guid.NewGuid().ToString();
-            string blobContents = "My Test Blob";
-            CloudBlobContainer inputContainer = Fixture.BlobClient.GetContainerReference("test-input-bash");
-            inputContainer.CreateIfNotExists();
-            CloudBlockBlob inputBlob = inputContainer.GetBlockBlobReference(name);
-            await inputBlob.UploadTextAsync(blobContents);
-
+            // the trigger blob was written by the fixture init code
+            // here we just wait for the output blob
             CloudBlobContainer outputContainer = Fixture.BlobClient.GetContainerReference("test-output-bash");
-            var resultBlob = outputContainer.GetBlockBlobReference(name);
+            var resultBlob = outputContainer.GetBlockBlobReference(Fixture.TestBlobName);
             await TestHelpers.WaitForBlobAsync(resultBlob);
 
             string resultContents = resultBlob.DownloadText();
-            Assert.Equal(blobContents, resultContents.Trim());
+            Assert.Equal(Fixture.TestBlobContents, resultContents.Trim());
         }
 
         public class TestFixture : EndToEndTestFixture
         {
             public TestFixture() : base(@"TestScripts\Bash", "bash")
+            { 
+            }
+
+            public string TestBlobContents { get; private set; }
+
+            public string TestBlobName { get; private set; }
+
+            protected override void CreateTestStorageEntities()
             {
+                base.CreateTestStorageEntities();
+
+                TestBlobContents = "My Test Blob";
+                TestBlobName = Guid.NewGuid().ToString();
+
+                // write the test blob before the host starts, so it gets picked
+                // up relatively quickly by the blob trigger test
+                CloudBlobContainer inputContainer = BlobClient.GetContainerReference("test-input-bash");
+                inputContainer.CreateIfNotExists();
+                CloudBlockBlob inputBlob = inputContainer.GetBlockBlobReference(TestBlobName);
+                inputBlob.UploadText(TestBlobContents);
             }
         }
     }

test/WebJobs.Script.Tests/EndToEndTestFixture.cs

@@ -71,7 +71,7 @@ public CloudQueue GetNewQueue(string queueName)
             return queue;
         }
 
-        private void CreateTestStorageEntities()
+        protected virtual void CreateTestStorageEntities()
         {
             TestQueue = QueueClient.GetQueueReference(string.Format("test-input-{0}", _testId));
             TestQueue.CreateIfNotExists();

test/WebJobs.Script.Tests/TestScripts/CSharp/BlobTrigger/function.json

@@ -345,12 +345,6 @@
     <None Include="TestScripts\CSharp\ApiHubFileTrigger\run.csx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="TestScripts\CSharp\BlobTrigger\function.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="TestScripts\CSharp\BlobTrigger\run.csx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="TestScripts\CSharp\DocumentDBIn\function.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>