Fixes flaky saucelabs tests which are timing out. The fix will allow

for 2 more retrials when the browser script execution times out.

Change-Id: I16732aee4501cb1b64cb91eb7f18ff7b325e6a02

Author: bojeil-google

protractor_spec.js

@@ -56,16 +56,43 @@ describe('Run all Closure unit tests', function() {
    */
   var executeTest = function(testPath) {
     it('runs ' + testPath + ' with success', function(done) {
-      browser.navigate()
-          .to(TEST_SERVER + '/' + testPath)
-          .then(function() {
-            waitForTest(function(status) {
-              expect(status).toBeSuccess();
-              done();
+      /**
+       * Runs the test routines for a given test path and retries up to a
+       * certain number of times on timeout.
+       * @param {number} tries The number of times to retry on timeout.
+       * @param {function} done The function to run on completion.
+       */
+      var runRoutine = function(tries, done) {
+        browser.navigate()
+            .to(TEST_SERVER + '/' + testPath)
+            .then(function() {
+              waitForTest(function(status) {
+                expect(status).toBeSuccess();
+                done();
+              }, function(err) {
+                // If browser test execution times out try up to trial times.
+                if (err.message &&
+                    err.message.indexOf('ETIMEDOUT') != -1 &&
+                    tries > 0) {
+                  runRoutine(tries - 1, done);
+                } else {
+                  done.fail(err);
+                }
+              });
             }, function(err) {
-              done.fail(err);
+              // If browser test execution times out try up to trial times.
+              if (err.message &&
+                  err.message.indexOf('ETIMEOUT') != -1 &&
+                  trial > 0) {
+                runRoutine(tries - 1, done);
+              } else {
+                done.fail(err);
+              }
             });
-          });
+      };
+      // Run test routine. Set timeout retrial to 2 times, eg. test will try
+      // 2 more times before giving up.
+      runRoutine(2, done);
     });
   };