Custom install me2me host on Linux Swarming bots.

testing/chromoting/browser_tests_launcher.py

 # Copyright (c) 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.
 
 
 """Utility script to launch browser-tests on the Chromoting bot."""
 import argparse
 import glob
 import hashlib
 import os
 from os.path import expanduser
 import shutil
 import socket
 import subprocess
 
 import psutil
 
 BROWSER_TEST_ID = 'browser_tests'
 PROD_DIR_ID = '#PROD_DIR#'
 HOST_HASH_VALUE = hashlib.md5(socket.gethostname()).hexdigest()
 SUCCESS_INDICATOR = 'SUCCESS: all tests passed.'
 NATIVE_MESSAGING_DIR = 'NativeMessagingHosts'
 CRD_ID = 'chrome-remote-desktop'  # Used in a few file/folder names
-CHROMOTING_HOST_PATH = '/opt/google/chrome-remote-desktop/chrome-remote-desktop'
+CHROMOTING_HOST_PATH = './remoting/host/linux/linux_me2me_host.py'
 TEST_FAILURE = False
 FAILING_TESTS = ''
 HOST_READY_INDICATOR = 'Host ready to receive connections.'
 BROWSER_NOT_STARTED_ERROR = (
     'Still waiting for the following processes to finish')
 TIME_OUT_INDICATOR = '(TIMED OUT)'
 MAX_RETRIES = 1
+ISOLATE_TEMP_FOLDER = ''

[joedow, 2015/08/07 22:16:19]

Can you init this variable up here instead of using a global?

[anandc, 2015/08/07 22:26:41]

Done.

 
 
 def LaunchBTCommand(args, command):
   """Launches the specified browser-test command.
 
       If the execution failed because a browser-instance was not launched, retry
       once.
   Args:
     args: Command line args, used for test-case startup tasks.
     command: Browser-test command line.
@@ skipping 107 matching lines @@
 def RestartMe2MeHost():
   """Stops and starts the Me2Me host on the test machine.
 
   Waits to confirm that host is ready to receive connections before returning.
 
   Returns:
     True: if HOST_READY_INDICATOR is found in stdout, indicating host is ready.
     False: if HOST_READY_INDICATOR not found in stdout.
   """
 
+  # To start the host, we want to be in the temp-folder for this test execution.
+  # Store the current folder to return back to it later.
+  cwd = os.getcwd()

[joedow, 2015/08/07 22:16:19]

can you use previous_directory here?  It is no longer the cwd once you change.

[anandc, 2015/08/07 22:26:41]

Done.

+  os.chdir(ISOLATE_TEMP_FOLDER)
+
   # Stop chromoting host.
   RunCommandInSubProcess(CHROMOTING_HOST_PATH + ' --stop')
   # Start chromoting host.
   results = RunCommandInSubProcess(CHROMOTING_HOST_PATH + ' --start')
+
+  # Go back to starting folder.

[joedow, 2015/08/07 22:16:19]

nit: remove comment, I think it will be obvious if you cwd to the
previous_directory.

[anandc, 2015/08/07 22:26:41]

Done.

+  os.chdir(cwd)
+  print 'Now in %s: ' % os.getcwd()
   # Confirm that the start process completed, and we got:
   # "Host ready to receive connections." in the log.
   if HOST_READY_INDICATOR not in results:
     return False
   return True
 
 
 def SetupUserProfileDir(me2me_manifest_file, it2me_manifest_file,
                         user_profile_dir):
   """Sets up the Google Chrome user profile directory.
@@ skipping 40 matching lines @@
     # Host restart failed. Don't run any more tests.
     raise Exception('Host restart failed.')
 
   # Reset the user profile directory to start each test with a clean slate.
   SetupUserProfileDir(args.me2me_manifest_file, args.it2me_manifest_file,
                       args.user_profile_dir)
 
 
 def main(args):
 
+  global ISOLATE_TEMP_FOLDER
+  # On a Swarming bot where these tests are executed, a temp folder is created
+  # under which the files specified in an .isolate are copied. This temp folder
+  # has a random name, which we'll store here for use late.
+  # Note that the test-execution always start from the testing/chromoting folder
+  # under the temp folder.
+  ISOLATE_TEMP_FOLDER = os.path.abspath(os.path.join(os.getcwd(), '../..'))
+
   InitialiseTestMachineForLinux(args.cfg_file)
 
   with open(args.commands_file) as f:
     for line in f:
       # Replace the PROD_DIR value in the command-line with
       # the passed in value.
       line = line.replace(PROD_DIR_ID, args.prod_dir)
       # Launch specified command line for test.
       LaunchBTCommand(args, line)
 
   # All tests completed. Include host-logs in the test results.
   host_log_contents = ''
-  # There should be only 1 log file, as we delete logs on test completion.
-  # Loop through matching files, just in case there are more.
   for log_file in glob.glob('/tmp/chrome_remote_desktop_*'):
     with open(log_file, 'r') as log:
       host_log_contents += '\nHOST LOG %s\n CONTENTS:\n%s' % (
           log_file, log.read())
   print host_log_contents
 
-  # Was there any test failure?
   if TEST_FAILURE:
     print '++++++++++AT LEAST 1 TEST FAILED++++++++++'
     print FAILING_TESTS.rstrip('\n')
     print '++++++++++++++++++++++++++++++++++++++++++'
     raise Exception('At least one test failed.')
 
 if __name__ == '__main__':
 
   parser = argparse.ArgumentParser()
   parser.add_argument('-f', '--commands_file',
                       help='path to file listing commands to be launched.')
   parser.add_argument('-p', '--prod_dir',
                       help='path to folder having product and test binaries.')
   parser.add_argument('-c', '--cfg_file',
                       help='path to test host config file.')
   parser.add_argument('--me2me_manifest_file',
                       help='path to me2me host manifest file.')
   parser.add_argument('--it2me_manifest_file',
                       help='path to it2me host manifest file.')
   parser.add_argument(
       '-u', '--user_profile_dir',
       help='path to user-profile-dir, used by connect-to-host tests.')
   command_line_args = parser.parse_args()
   try:
     main(command_line_args)
   finally:
     # Stop host and cleanup user-profile-dir.
     TestMachineCleanup(command_line_args.user_profile_dir)