Fixing the Chromoting Test Driver host online retry logic

remoting/test/chromoting_test_driver.cc

 // Copyright 2015 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.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 189 matching lines @@
 
   // The host name determines which host to initiate a session with from the
   // host list returned from the directory service.
   options.host_name =
       command_line->GetSwitchValueASCII(switches::kHostNameSwitchName);
 
   if (options.host_name.empty()) {
     LOG(ERROR) << "No hostname passed in, connect to host requires hostname!";
     return -1;
   }
+  VLOG(1) << "host_name: '" << options.host_name << "'";
 
   options.host_jid =
       command_line->GetSwitchValueASCII(switches::kHostJidSwitchName);
-
-  VLOG(1) << "Chromoting tests will connect to: " << options.host_name;
+  VLOG(1) << "host_jid: '" << options.host_jid << "'";
 
   options.pin = command_line->GetSwitchValueASCII(switches::kPinSwitchName);
 
   // Create and register our global test data object. It will handle
   // retrieving an access token or host list for the user. The GTest framework
   // will own the lifetime of this object once it is registered below.
   scoped_ptr<remoting::test::ChromotingTestDriverEnvironment> shared_data(
       new remoting::test::ChromotingTestDriverEnvironment(options));
 
   if (!shared_data->Initialize(auth_code)) {
+    VLOG(1) << "Failed to initialize ChromotingTestDriverEnvironment instance.";
     // If we failed to initialize our shared data object, then bail.
     return -1;
   }
 
-  if (!options.host_jid.empty() &&
-      !shared_data->WaitForHostOnline(options.host_jid, options.host_name)) {
-    // Host with expected JID is not online. No point running further tests.
+  // This method is necessary as there are occasional propagation delays in the
+  // backend and we don't want the test to fail because of that.
+  if (!shared_data->WaitForHostOnline(options.host_jid, options.host_name)) {
+    VLOG(1) << "The expected host was not available for connections.";
+    // Host is not online. No point running further tests.
     return -1;
   }
 
   // Since we've successfully set up our shared_data object, we'll assign the
   // value to our global* and transfer ownership to the framework.
   remoting::test::g_chromoting_shared_data = shared_data.release();
   testing::AddGlobalTestEnvironment(remoting::test::g_chromoting_shared_data);
 
   // Running the tests serially will avoid clients from connecting to the same
   // host.
   return base::LaunchUnitTestsSerially(
       argc, argv,
       base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
 }