Merge pull request Azure#1093 from hovsepm/master

Bumped up gulp npm versions
begoldsm · May 25, 2016 · 47e95a5 · 47e95a5
2 parents c54836a + 58366bd
commit 47e95a5
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 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<TBody, THeader>(HttpStatusCode expectedStat
 
         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
   })));
 });
 

diff --git a/package.json b/package.json
@@ -22,15 +22,15 @@
   "devDependencies": {
     "del": "^1.2.0",
     "glob": "^5.0.13",
-    "gulp": "^3.9.0",
-    "gulp-debug": "^2.0.1",
+    "gulp": "^3.9.1",
+    "gulp-debug": "^2.1.2",
     "gulp-dotnet-assembly-info": "^0.1.10",
-    "gulp-env": "^0.2.0",
-    "gulp-msbuild": "^0.2.13",
+    "gulp-env": "^0.4.0",
+    "gulp-msbuild": "^0.3.2",
     "gulp-replace": "^0.5.3",
-    "gulp-shell": "^0.5",
+    "gulp-shell": "^0.5.2",
     "gulp-spawn": "^0.3.0",
-    "gulp-util": "^3",
+    "gulp-util": "^3.0.7",
     "merge2": "^0.3.6",
     "q": "^1.4.1",
     "require-dir": "^0.3.0",