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