Enable PIN browser tests on the waterfall.

remoting/webapp/browser_test/browser_test.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  *
  * Provides basic functionality for JavaScript based browser test.
  *
  * To define a browser test, create a class under the browserTest namespace.
@@ skipping 172 matching lines @@
     }
     remoting.testEvents.addEventListener(uiModeChanged, onUIModeChanged);
   });
 };
 
 /**
  * @return {Promise}
  */
 browserTest.connectMe2Me = function() {
   var AppMode = remoting.AppMode;
-  browserTest.clickOnControl('this-host-connect');
-  return browserTest.onUIMode(AppMode.CLIENT_HOST_NEEDS_UPGRADE).then(
-    function() {
+  // The one second timeout is necessary because the click handler of
+  // 'this-host-connect' is registered asynchronously.
+  return base.Promise.sleep(1000).then(function() {
+      browserTest.clickOnControl('this-host-connect');
+    }).then(function(){
+      return browserTest.onUIMode(AppMode.CLIENT_HOST_NEEDS_UPGRADE);
+    }).then(function() {
       // On fulfilled.
       browserTest.clickOnControl('host-needs-update-connect-button');
     }, function() {
       // On time out.
       return Promise.resolve();
     }).then(function() {
       return browserTest.onUIMode(AppMode.CLIENT_PIN_PROMPT, 10000);
     });
 };
 
@@ skipping 46 matching lines @@
 /**
  * @param {remoting.DesktopConnectedView.Mode} connectionMode
  * @param {string} errorTag
  * @return {Promise}
  */
 browserTest.expectConnectionError = function(connectionMode, errorTag) {
   var AppMode = remoting.AppMode;
   var Timeout = browserTest.Timeout;
 
   var finishButton = 'client-finished-me2me-button';
-  var failureMode = AppMode.CLIENT_CONNECT_FAILED_ME2ME;
 
   if (connectionMode == remoting.DesktopConnectedView.Mode.IT2ME) {
-    failureMode = AppMode.CLIENT_CONNECT_FAILED_IT2ME;
     finishButton = 'client-finished-it2me-button';
   }
 
   var onConnected = browserTest.onUIMode(AppMode.IN_SESSION, Timeout.NONE);
-  var onFailure = browserTest.onUIMode(failureMode);
+  var onFailure = Promise.race([
+      browserTest.onUIMode(AppMode.CLIENT_CONNECT_FAILED_ME2ME),

[kelvinp, 2015/02/23 21:17:51]

Better handle test flakiness on IT2Me tests.  This is due to a bug in our
production code that the connection mode is not set correctly, which should go
away when the refactor is finished.

+      browserTest.onUIMode(AppMode.CLIENT_CONNECT_FAILED_IT2ME)]);
 
   onConnected = onConnected.then(function() {
     return Promise.reject(
         'Expected the connection to fail.');
   });
 
   onFailure = onFailure.then(function() {
     /** @type {Element} */
     var errorDiv = document.getElementById('connect-error-message');
     var actual = errorDiv.innerText;
@@ skipping 25 matching lines @@
     var errorMsg = errorDiv.innerText;
     return Promise.reject('Unexpected error - ' + errorMsg);
   });
   return Promise.race([onConnected, onFailure]);
 };
 
 /**
  * @param {base.EventSource} eventSource
  * @param {string} event
  * @param {number} timeoutMs
- * @param {?string} opt_expectedData
+ * @param {*=} opt_expectedData
  * @return {Promise}
  */
 browserTest.expectEvent = function(eventSource, event, timeoutMs,
                                    opt_expectedData) {
   return new Promise(function(fullfil, reject) {
     /** @param {string=} actualData */
     var verifyEventParameters = function(actualData) {
       if (opt_expectedData === undefined || opt_expectedData === actualData) {
         fullfil(true);
       } else {
@@ skipping 49 matching lines @@
     console.log('browserTest: PIN Setup is done.');
     browserTest.clickOnControl('host-config-done-dismiss');
 
     // On Linux, we restart the host after changing the PIN, need to sleep
     // for ten seconds before the host is ready for connection.
     return base.Promise.sleep(HOST_SETUP_WAIT);
   });
 };
 
 /**
- * @return {Promise}
+ * @return {Promise<boolean>}
  */
 browserTest.isLocalHostStarted = function() {
   return new Promise(function(resolve) {
     remoting.hostController.getLocalHostState(function(state) {
       resolve(remoting.HostController.State.STARTED == state);
     });
   });
 };
 
 /**
@@ skipping 24 matching lines @@
  */
 browserTest.ensureRemoteConnectionEnabled = function(pin) {
   browserTest.ensureHostStartedWithPIN(pin).then(function() {
     browserTest.pass();
   }, function(reason) {
     browserTest.fail(reason);
   });
 };
 
 browserTest.init();