Adding more logging for gulp.msbuild and retrying for http failures.

jianghaolu · May 25, 2016 · 58366bd · 58366bd
1 parent 9f4f7d6
commit 58366bd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/AcceptanceTests.cs b/AutoRest/Generators/CSharp/CSharp.Tests/AcceptanceTests.cs
@@ -2310,8 +2310,27 @@ private static void EnsureStatusCode(HttpStatusCode expectedStatusCode, Func<Tas
 
         private static void EnsureStatusCode<THeader>(HttpStatusCode expectedStatusCode, Func<Task<HttpOperationHeaderResponse<THeader>>> operation)
         {
-            var response = operation().GetAwaiter().GetResult();
-            Assert.Equal(response.Response.StatusCode, expectedStatusCode);
+            // Adding retry because of flakiness of TestServer on Travis runs
+            HttpRequestException ex = null;
+            for (int i = 0; i < 3; i++)
+            {
+                HttpOperationHeaderResponse<THeader> response;
+                try
+                {
+                    response = operation().GetAwaiter().GetResult();
+                }
+                catch(HttpRequestException x)
+                {
+                    System.Threading.Thread.Sleep(10);
+                    ex = x;
+                    continue;
+                }
+                Assert.Equal(response.Response.StatusCode, expectedStatusCode);
+                return;
+            }
+            Assert.True(
+                false, 
+                string.Format("EnsureStatusCode for '{0}' failed 3 times in a row. Last failure message: {1}", expectedStatusCode, ex));
         }
 
         private static void EnsureThrowsWithStatusCode(HttpStatusCode expectedStatusCode,

diff --git a/gulpfile.js b/gulpfile.js
@@ -498,7 +498,9 @@ gulp.task('build', function(cb) {
   // warning 0219 is for unused variables, which causes the build to fail on xbuild
   return gulp.src('build.proj').pipe(msbuild(mergeOptions(msbuildDefaults, {
     targets: ['build'],
-    properties: { WarningsNotAsErrors: 0219, Configuration: 'Debug' }
+    properties: { WarningsNotAsErrors: 0219, Configuration: 'Debug' },
+    stdout: true,
+    errorOnFail: true
   })));
 });