Merge branch 'aosp/mirror-chromium-master' into update_utils am: 4307f4735e am: 18caef1eddandroid-o-mr1-iot-preview-6o-mr1-iot-preview-6

am: 6c551e0d52

Change-Id: I44720cd3cd736bb61f583fb20df1c25ac9323ae0

15 files changed, 88 insertions, 76 deletions

diff --git a/binary_search_tool/test/binary_search_tool_tester.py b/binary_search_tool/test/binary_search_tool_tester.py
index 775c1715..e733d9c4 100755
--- a/binary_search_tool/test/binary_search_tool_tester.py
+++ b/binary_search_tool/test/binary_search_tool_tester.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 
 # Copyright 2012 Google Inc. All Rights Reserved.
 """Tests for bisecting tool."""
@@ -66,12 +66,13 @@ class BisectTest(unittest.TestCase):
       return 0
 
     def Run(self):
-      return binary_search_state.Run(get_initial_items='./gen_init_list.py',
-                                     switch_to_good='./switch_to_good.py',
-                                     switch_to_bad='./switch_to_bad.py',
-                                     test_script='./is_good.py',
-                                     prune=True,
-                                     file_args=True)
+      return binary_search_state.Run(
+          get_initial_items='./gen_init_list.py',
+          switch_to_good='./switch_to_good.py',
+          switch_to_bad='./switch_to_bad.py',
+          test_script='./is_good.py',
+          prune=True,
+          file_args=True)
 
     def PostRun(self):
       CleanObj()
@@ -127,26 +128,31 @@ class BisectingUtilsTest(unittest.TestCase):
     except OSError:
       pass
 
-    cleanup_list = ['./is_setup', binary_search_state.STATE_FILE,
-                    'noinc_prune_bad', 'noinc_prune_good']
+    cleanup_list = [
+        './is_setup', binary_search_state.STATE_FILE, 'noinc_prune_bad',
+        'noinc_prune_good'
+    ]
     for f in cleanup_list:
       if os.path.exists(f):
         os.remove(f)
 
   def runTest(self):
-    ret = binary_search_state.Run(get_initial_items='./gen_init_list.py',
-                                  switch_to_good='./switch_to_good.py',
-                                  switch_to_bad='./switch_to_bad.py',
-                                  test_script='./is_good.py',
-                                  prune=True,
-                                  file_args=True)
+    ret = binary_search_state.Run(
+        get_initial_items='./gen_init_list.py',
+        switch_to_good='./switch_to_good.py',
+        switch_to_bad='./switch_to_bad.py',
+        test_script='./is_good.py',
+        prune=True,
+        file_args=True)
     self.assertEquals(ret, 0)
     self.check_output()
 
   def test_arg_parse(self):
-    args = ['--get_initial_items', './gen_init_list.py', '--switch_to_good',
-            './switch_to_good.py', '--switch_to_bad', './switch_to_bad.py',
-            '--test_script', './is_good.py', '--prune', '--file_args']
+    args = [
+        '--get_initial_items', './gen_init_list.py', '--switch_to_good',
+        './switch_to_good.py', '--switch_to_bad', './switch_to_bad.py',
+        '--test_script', './is_good.py', '--prune', '--file_args'
+    ]
     ret = binary_search_state.Main(args)
     self.assertEquals(ret, 0)
     self.check_output()
@@ -154,32 +160,35 @@ class BisectingUtilsTest(unittest.TestCase):
   def test_test_setup_script(self):
     os.remove('./is_setup')
     with self.assertRaises(AssertionError):
-      ret = binary_search_state.Run(get_initial_items='./gen_init_list.py',
-                                    switch_to_good='./switch_to_good.py',
-                                    switch_to_bad='./switch_to_bad.py',
-                                    test_script='./is_good.py',
-                                    prune=True,
-                                    file_args=True)
-
-    ret = binary_search_state.Run(get_initial_items='./gen_init_list.py',
-                                  switch_to_good='./switch_to_good.py',
-                                  switch_to_bad='./switch_to_bad.py',
-                                  test_script='./is_good.py',
-                                  test_setup_script='./test_setup.py',
-                                  prune=True,
-                                  file_args=True)
+      ret = binary_search_state.Run(
+          get_initial_items='./gen_init_list.py',
+          switch_to_good='./switch_to_good.py',
+          switch_to_bad='./switch_to_bad.py',
+          test_script='./is_good.py',
+          prune=True,
+          file_args=True)
+
+    ret = binary_search_state.Run(
+        get_initial_items='./gen_init_list.py',
+        switch_to_good='./switch_to_good.py',
+        switch_to_bad='./switch_to_bad.py',
+        test_script='./is_good.py',
+        test_setup_script='./test_setup.py',
+        prune=True,
+        file_args=True)
     self.assertEquals(ret, 0)
     self.check_output()
 
   def test_bad_test_setup_script(self):
     with self.assertRaises(AssertionError):
-      binary_search_state.Run(get_initial_items='./gen_init_list.py',
-                              switch_to_good='./switch_to_good.py',
-                              switch_to_bad='./switch_to_bad.py',
-                              test_script='./is_good.py',
-                              test_setup_script='./test_setup_bad.py',
-                              prune=True,
-                              file_args=True)
+      binary_search_state.Run(
+          get_initial_items='./gen_init_list.py',
+          switch_to_good='./switch_to_good.py',
+          switch_to_bad='./switch_to_bad.py',
+          test_script='./is_good.py',
+          test_setup_script='./test_setup_bad.py',
+          prune=True,
+          file_args=True)
 
   def test_bad_save_state(self):
     state_file = binary_search_state.STATE_FILE
@@ -294,13 +303,14 @@ class BisectingUtilsTest(unittest.TestCase):
     self.assertEquals(bad_objs[found_obj], 1)
 
   def test_set_file(self):
-    binary_search_state.Run(get_initial_items='./gen_init_list.py',
-                            switch_to_good='./switch_to_good_set_file.py',
-                            switch_to_bad='./switch_to_bad_set_file.py',
-                            test_script='./is_good.py',
-                            prune=True,
-                            file_args=True,
-                            verify=True)
+    binary_search_state.Run(
+        get_initial_items='./gen_init_list.py',
+        switch_to_good='./switch_to_good_set_file.py',
+        switch_to_bad='./switch_to_bad_set_file.py',
+        test_script='./is_good.py',
+        prune=True,
+        file_args=True,
+        verify=True)
     self.check_output()
 
   def test_noincremental_prune(self):
@@ -343,13 +353,14 @@ class BisectStressTest(unittest.TestCase):
   def test_every_obj_bad(self):
     amt = 25
     gen_obj.Main(['--obj_num', str(amt), '--bad_obj_num', str(amt)])
-    ret = binary_search_state.Run(get_initial_items='./gen_init_list.py',
-                                  switch_to_good='./switch_to_good.py',
-                                  switch_to_bad='./switch_to_bad.py',
-                                  test_script='./is_good.py',
-                                  prune=True,
-                                  file_args=True,
-                                  verify=False)
+    ret = binary_search_state.Run(
+        get_initial_items='./gen_init_list.py',
+        switch_to_good='./switch_to_good.py',
+        switch_to_bad='./switch_to_bad.py',
+        test_script='./is_good.py',
+        prune=True,
+        file_args=True,
+        verify=False)
     self.assertEquals(ret, 0)
     self.check_output()
 
@@ -360,13 +371,14 @@ class BisectStressTest(unittest.TestCase):
       obj_list[i] = '1'
       obj_list = ','.join(obj_list)
       gen_obj.Main(['--obj_list', obj_list])
-      ret = binary_search_state.Run(get_initial_items='./gen_init_list.py',
-                                    switch_to_good='./switch_to_good.py',
-                                    switch_to_bad='./switch_to_bad.py',
-                                    test_setup_script='./test_setup.py',
-                                    test_script='./is_good.py',
-                                    prune=True,
-                                    file_args=True)
+      ret = binary_search_state.Run(
+          get_initial_items='./gen_init_list.py',
+          switch_to_good='./switch_to_good.py',
+          switch_to_bad='./switch_to_bad.py',
+          test_setup_script='./test_setup.py',
+          test_script='./is_good.py',
+          prune=True,
+          file_args=True)
       self.assertEquals(ret, 0)
       self.check_output()
 
diff --git a/binary_search_tool/test/common.py b/binary_search_tool/test/common.py
index baac9434..5c3ff538 100755
--- a/binary_search_tool/test/common.py
+++ b/binary_search_tool/test/common.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Common utility functions."""
 
 DEFAULT_OBJECT_NUMBER = 1238
diff --git a/binary_search_tool/test/gen_init_list.py b/binary_search_tool/test/gen_init_list.py
index 4a79a1b1..002fc352 100755
--- a/binary_search_tool/test/gen_init_list.py
+++ b/binary_search_tool/test/gen_init_list.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Prints out index for every object file, starting from 0."""
 
 from __future__ import print_function
diff --git a/binary_search_tool/test/gen_obj.py b/binary_search_tool/test/gen_obj.py
index 265729d2..d17e93f5 100755
--- a/binary_search_tool/test/gen_obj.py
+++ b/binary_search_tool/test/gen_obj.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Script to generate a list of object files.
 
 0 represents a good object file.
@@ -86,8 +86,8 @@ def Main(argv):
 
   obj_num = len(obj_list)
   bad_obj_num = obj_list.count('1')
-  print('Generated {0} object files, with {1} bad ones.'.format(obj_num,
-                                                                bad_obj_num))
+  print('Generated {0} object files, with {1} bad ones.'.format(
+      obj_num, bad_obj_num))
 
   return 0
 
diff --git a/binary_search_tool/test/is_good.py b/binary_search_tool/test/is_good.py
index bfe9cc32..a0be4a08 100755
--- a/binary_search_tool/test/is_good.py
+++ b/binary_search_tool/test/is_good.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Check to see if the working set produces a good executable."""
 
 from __future__ import print_function
diff --git a/binary_search_tool/test/is_good_noinc_prune.py b/binary_search_tool/test/is_good_noinc_prune.py
index 5aafd6c2..a900bd32 100755
--- a/binary_search_tool/test/is_good_noinc_prune.py
+++ b/binary_search_tool/test/is_good_noinc_prune.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Check to see if the working set produces a good executable.
 
 This test script is made for the noincremental-prune test. This makes sure
diff --git a/binary_search_tool/test/switch_tmp.py b/binary_search_tool/test/switch_tmp.py
index 165004ed..51b7110e 100755
--- a/binary_search_tool/test/switch_tmp.py
+++ b/binary_search_tool/test/switch_tmp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Change portions of the object files to good.
 
 This file is a test switch script. Used only for the test test_tmp_cleanup.
diff --git a/binary_search_tool/test/switch_to_bad.py b/binary_search_tool/test/switch_to_bad.py
index b8602421..a1b6bd59 100755
--- a/binary_search_tool/test/switch_to_bad.py
+++ b/binary_search_tool/test/switch_to_bad.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Switch part of the objects file in working set to (possible) bad ones."""
 
 from __future__ import print_function
diff --git a/binary_search_tool/test/switch_to_bad_noinc_prune.py b/binary_search_tool/test/switch_to_bad_noinc_prune.py
index 87bf1584..db76acad 100755
--- a/binary_search_tool/test/switch_to_bad_noinc_prune.py
+++ b/binary_search_tool/test/switch_to_bad_noinc_prune.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Switch part of the objects file in working set to (possible) bad ones.
 
 The "portion" is defined by the file (which is passed as the only argument to
diff --git a/binary_search_tool/test/switch_to_bad_set_file.py b/binary_search_tool/test/switch_to_bad_set_file.py
index f535fdfd..edf226d3 100755
--- a/binary_search_tool/test/switch_to_bad_set_file.py
+++ b/binary_search_tool/test/switch_to_bad_set_file.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Switch part of the objects file in working set to (possible) bad ones.
 
 This script is meant to be specifically used with the set_file test. This uses
diff --git a/binary_search_tool/test/switch_to_good.py b/binary_search_tool/test/switch_to_good.py
index 68e9633f..59a118c1 100755
--- a/binary_search_tool/test/switch_to_good.py
+++ b/binary_search_tool/test/switch_to_good.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Change portions of the object files to good.
 
 The "portion" is defined by the file (which is passed as the only argument to
diff --git a/binary_search_tool/test/switch_to_good_noinc_prune.py b/binary_search_tool/test/switch_to_good_noinc_prune.py
index c5e78e45..00488a74 100755
--- a/binary_search_tool/test/switch_to_good_noinc_prune.py
+++ b/binary_search_tool/test/switch_to_good_noinc_prune.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Change portions of the object files to good.
 
 The "portion" is defined by the file (which is passed as the only argument to
diff --git a/binary_search_tool/test/switch_to_good_set_file.py b/binary_search_tool/test/switch_to_good_set_file.py
index 83777af0..b5e521f9 100755
--- a/binary_search_tool/test/switch_to_good_set_file.py
+++ b/binary_search_tool/test/switch_to_good_set_file.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Change portions of the object files to good.
 
 The "portion" is defined by the file (which is passed as the only argument to
diff --git a/binary_search_tool/test/test_setup.py b/binary_search_tool/test/test_setup.py
index 3fb5a23c..0d6a410e 100755
--- a/binary_search_tool/test/test_setup.py
+++ b/binary_search_tool/test/test_setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Emulate running of test setup script, is_good.py should fail without this."""
 
 from __future__ import print_function
diff --git a/binary_search_tool/test/test_setup_bad.py b/binary_search_tool/test/test_setup_bad.py
index 8d72763e..d715f57a 100755
--- a/binary_search_tool/test/test_setup_bad.py
+++ b/binary_search_tool/test/test_setup_bad.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 """Emulate test setup that fails (i.e. failed flash to device)"""
 
 from __future__ import print_function