Merge branch 'aosp/mirror-chromium-master' into update_utils am: 4307f4735e am: 18caef1edd am: 6c551e0d52 am: ddfea1f7e7android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-platform-releasepie-gsipie-dr1-releasepie-dr1-devpie-devpie-cuttlefish-testingpie-cts-releasepie-b4s4-releasepie-b4s4-dev

am: f1a93c225b

Change-Id: I60d258ddb8fd0bf9632f1f70c5cdeb3078938059

1 files changed, 50 insertions, 46 deletions

diff --git a/remote_test.py b/remote_test.py
index 82f54ed5..62598d5a 100755
--- a/remote_test.py
+++ b/remote_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 """Script to wrap test_that script.
@@ -26,14 +26,13 @@ def Usage(parser, message):
 
 def Main(argv):
   parser = argparse.ArgumentParser()
-  parser.add_argument('-c',
-                      '--chromeos_root',
-                      dest='chromeos_root',
-                      help='ChromeOS root checkout directory')
-  parser.add_argument('-r',
-                      '--remote',
-                      dest='remote',
-                      help='Remote chromeos device.')
+  parser.add_argument(
+      '-c',
+      '--chromeos_root',
+      dest='chromeos_root',
+      help='ChromeOS root checkout directory')
+  parser.add_argument(
+      '-r', '--remote', dest='remote', help='Remote chromeos device.')
   options = parser.parse_args(argv)
   if options.chromeos_root is None:
     Usage(parser, 'chromeos_root must be given')
@@ -45,50 +44,55 @@ def Main(argv):
 
   command = 'ls -lt /'
   ce = command_executer.GetCommandExecuter()
-  ce.CrosRunCommand(command,
-                    chromeos_root=options.chromeos_root,
-                    machine=options.remote)
+  ce.CrosRunCommand(
+      command, chromeos_root=options.chromeos_root, machine=options.remote)
 
   version_dir_path, script_name = misc.GetRoot(sys.argv[0])
   version_dir = misc.GetRoot(version_dir_path)[1]
 
   # Tests to copy directories and files to the chromeos box.
-  ce.CopyFiles(version_dir_path,
-               '/tmp/' + version_dir,
-               dest_machine=options.remote,
-               dest_cros=True,
-               chromeos_root=options.chromeos_root)
-  ce.CopyFiles(version_dir_path,
-               '/tmp/' + version_dir + '1',
-               dest_machine=options.remote,
-               dest_cros=True,
-               chromeos_root=options.chromeos_root)
-  ce.CopyFiles(sys.argv[0],
-               '/tmp/' + script_name,
-               recursive=False,
-               dest_machine=options.remote,
-               dest_cros=True,
-               chromeos_root=options.chromeos_root)
-  ce.CopyFiles(sys.argv[0],
-               '/tmp/' + script_name + '1',
-               recursive=False,
-               dest_machine=options.remote,
-               dest_cros=True,
-               chromeos_root=options.chromeos_root)
+  ce.CopyFiles(
+      version_dir_path,
+      '/tmp/' + version_dir,
+      dest_machine=options.remote,
+      dest_cros=True,
+      chromeos_root=options.chromeos_root)
+  ce.CopyFiles(
+      version_dir_path,
+      '/tmp/' + version_dir + '1',
+      dest_machine=options.remote,
+      dest_cros=True,
+      chromeos_root=options.chromeos_root)
+  ce.CopyFiles(
+      sys.argv[0],
+      '/tmp/' + script_name,
+      recursive=False,
+      dest_machine=options.remote,
+      dest_cros=True,
+      chromeos_root=options.chromeos_root)
+  ce.CopyFiles(
+      sys.argv[0],
+      '/tmp/' + script_name + '1',
+      recursive=False,
+      dest_machine=options.remote,
+      dest_cros=True,
+      chromeos_root=options.chromeos_root)
 
   # Test to copy directories and files from the chromeos box.
-  ce.CopyFiles('/tmp/' + script_name,
-               '/tmp/hello',
-               recursive=False,
-               src_machine=options.remote,
-               src_cros=True,
-               chromeos_root=options.chromeos_root)
-  ce.CopyFiles('/tmp/' + script_name,
-               '/tmp/' + script_name,
-               recursive=False,
-               src_machine=options.remote,
-               src_cros=True,
-               chromeos_root=options.chromeos_root)
+  ce.CopyFiles(
+      '/tmp/' + script_name,
+      '/tmp/hello',
+      recursive=False,
+      src_machine=options.remote,
+      src_cros=True,
+      chromeos_root=options.chromeos_root)
+  ce.CopyFiles(
+      '/tmp/' + script_name,
+      '/tmp/' + script_name,
+      recursive=False,
+      src_machine=options.remote,
+      src_cros=True,
+      chromeos_root=options.chromeos_root)
   board = ce.CrosLearnBoard(options.chromeos_root, options.remote)
   print(board)
   return 0