Increase timeout for connectivity tests and add error message

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-  - 0.10
+  - 4.1
 
 env:
   matrix:

src/js/conntest.js

@@ -40,32 +40,62 @@ function hostConnectivityTest() {
 }
 
 function runConnectivityTest(iceCandidateFilter, config) {
+  var candidates = [];
   var call = new Call(config);
   call.setIceCandidateFilter(iceCandidateFilter);
+
+  // Collect all candidate for validation.
+  call.pc1.onicecandidate = function(event) {
+    if (event.candidate) {
+      candidates.push(Call.parseCandidate(event.candidate.candidate));
+    }
+  };
+
   var ch1 = call.pc1.createDataChannel(null);
   ch1.addEventListener('open', function() {
     ch1.send('hello');
   });
   ch1.addEventListener('message', function(event) {
-    clearTimeout(timeout);
     if (event.data !== 'world') {
-      reportFatal();
+      reportError('Data not transmitted.');
     } else {
       reportSuccess('Data successfully transmitted between peers.');
-      setTestFinished();
     }
+    hangup();
   });
   call.pc2.addEventListener('datachannel', function(event) {
     var ch2 = event.channel;
     ch2.addEventListener('message', function(event) {
       if (event.data !== 'hello') {
-        clearTimeout(timeout);
-        reportFatal();
+        hangup('Data not transmitted.');
       } else {
         ch2.send('world');
       }
     });
   });
   call.establishConnection();
-  timeout = setTimeout(reportFatal.bind(null, 'Timed out'), 2000);
+  timeout = setTimeout(hangup.bind(null, 'Timed out'), 5000);
+
+  function hangup(errorMessage) {
+    if (errorMessage) {
+      var reflexiveCandidateFound = function() {
+        for (var candidate in candidates) {
+          if (Call.isReflexive(candidates[candidate])) {
+            return true;
+          }
+        }
+      };
+
+      var warningMessage = 'Server reflexive candidate received but cannot ' +
+            'connect. Most likely due to the network environment.';
+      if (reflexiveCandidateFound) {
+        reportWarning(warningMessage);
+      } else {
+        reportError(errorMessage);
+      }
+    }
+    clearTimeout(timeout);
+    call.close();
+    setTestFinished();
+  }
 }

src/js/nettest.js

@@ -71,7 +71,12 @@ function gatherCandidates(config, params, isGood) {
   try {
     pc = new RTCPeerConnection(config, params);
   } catch (error) {
-    return reportFatal('Fail to create peer connection: ' + error);
+    if (params.optional[0].googIPv6) {
+      return reportWarning('Failed to create peer connection, IPv6 ' +
+          'might not be setup/supported on the network.');
+    } else {
+      return reportError('Failed to create peer connection: ' + error);
+    }
   }
 
   // In our candidate callback, stop if we get a candidate that passes |isGood|.
@@ -91,7 +96,13 @@ function gatherCandidates(config, params, isGood) {
       }
     } else {
       pc.close();
-      reportFatal('Failed to gather specified candidates');
+      if (!params.optional[0].googIPv6) {
+        reportWarning('Failed to gather IPv6 candidates, it ' +
+          'might not be setup/supported on the network.');
+      } else {
+        reportError('Failed to gather specified candidates');
+        setTestFinished();
+      }
     }
   };
 

src/ui/testrtc-suite.html

@@ -93,7 +93,7 @@
       },
       _iconForState: function (state) {
         if (state === 'failure') { return 'close'; }
-        if (state === 'warning') { return 'check'; }
+        if (state === 'warning') { return 'warning'; }
         if (state === 'success') { return 'check'; }
         if (state === 'running') { return 'more-horiz'; }
         return '';
@@ -129,7 +129,7 @@
           this.opened = false;
         } else if (errors === 0 && warnings > 0) {
           this.state = 'warning';
-          this.opened = false;
+          this.opened = true;
         } else {
           this.state = 'failure';
           this.opened = true;

src/ui/testrtc-test.html

@@ -99,6 +99,7 @@
       _iconForState: function(state) {
         if (state === 'running') return 'more-horiz';
         if (state === 'success') return 'check';
+        if (state === 'warning') return 'warning';
         if (state === 'failure') return 'close';
         if (state === 'disabled') return '';
         return '';
@@ -137,8 +138,18 @@
       done: function() {
         this.setProgress(null);
         var success =
-            (this.errorCount === 0 && (this.successCount + this.warningCount) > 0);
-        this.state = (success ? 'success' : (this.isDisabled ? 'disabled' : 'failure'));
+          (this.errorCount + this.warningCount === 0 && this.successCount > 0);
+
+        if (success) {
+          this.state = 'success';
+        } else if (this.errorCount > 0) {
+          this.state = 'failure';
+        } else if (this.warningCount > 0) {
+          this.state = 'warning';
+        } else if (this.isDisabled) {
+          this.state = 'disabled';
+        }
+
         this.traceTestEvent({status: this.state});
         report.logTestRunResult(this.name, this.state);
         this.doneCallback_();
@@ -180,6 +191,9 @@
         this.traceTestEvent({info: str});
       },
 
+      // Use only for error callbacks upon test invocation, not to end the test,
+      // use report<Status>(message) and setTestFinished() for that.
+      // TODO: Figure out a better way to do this.
       reportFatal: function(str) {
         this.reportError(str);
         this.done();

test/run-tests

@@ -3,7 +3,7 @@
 # Installs Chrome or Firefox if missing and sets default browser to
 # chrome stable.
 #
-echo "\nPreparing Selenium webdriver tests."
+echo "Preparing Selenium webdriver tests."
 
 BINDIR=./browsers/bin
 export BROWSER=${BROWSER-chrome}