Fix python scripts in src/webkit

webkit/tools/leak_tests/run_node_leak_test.py

-#!/usr/bin/python
+#!/usr/bin/env python

[Dirk Pranke, 2011/11/23 21:29:15]

I bet this can go, too.

 # Copyright (c) 2006-2008 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.
 
 """Run node leak tests using the test_shell.
 
 TODO(pjohnson): Add a way for layout tests (and other local files in the
 working copy) to be easily run by specifying paths relative to webkit (or
 something similar).
 """
@@ skipping 17 matching lines @@
 PASS, FAIL, REBASELINE = range(3)
 
 # The test list files are found in this subdirectory, which must be a sibling
 # to this script itself.
 TEST_FILE_DIR = 'test_lists'
 
 # TODO(pjohnson): Find a way to avoid this duplicate code.  This function has
 # been shamelessly taken from layout_tests/layout_package.
 _webkit_root = None
 
+
 def WebKitRoot():
   """Returns the full path to the directory containing webkit.sln.  Raises
   PathNotFound if we're unable to find webkit.sln.
   """
 
   global _webkit_root
   if _webkit_root:
     return _webkit_root
   webkit_sln_path = google.path_utils.FindUpward(google.path_utils.ScriptDir(),
                                                  'webkit.sln')
@@ skipping 14 matching lines @@
 
   full_path = os.path.join(WebKitRoot(), target, 'test_shell_tests.exe')
   if not os.path.exists(full_path):
     # Try chrome's output directory in case test_shell was built by chrome.sln.
     full_path = google.path_utils.FindUpward(WebKitRoot(), 'chrome', target,
                                              'test_shell_tests.exe')
     if not os.path.exists(full_path):
       raise PathNotFound('unable to find test_shell_tests at %s' % full_path)
   return full_path
 
-class NodeLeakTestRunner:
+
+class NodeLeakTestRunner(object):
   """A class for managing running a series of node leak tests.
   """
 
   def __init__(self, options, urls):
     """Collect a list of URLs to test.
 
     Args:
       options: a dictionary of command line options
       urls: a list of URLs in the format:
             (url, expected_node_leaks, expected_js_leaks) tuples
@@ skipping 101 matching lines @@
         results[FAIL] += 1
         failed_urls.append(test_url)
         status = FAIL
       elif result == REBASELINE:
         results[REBASELINE] += 1
         rebaseline_urls.append(test_url)
         if status != FAIL:
           status = REBASELINE
     return (status, results, failed_urls, rebaseline_urls)
 
-def main(options, args):
+
+def run_node_leak_test(options, args):
   if options.seed != None:
     random.seed(options.seed)
 
   # Set up logging so any messages below logging.WARNING are sent to stdout,
   # otherwise they are sent to stderr.
   google.logging_utils.config_root(level=logging.INFO,
                                    threshold=logging.WARNING)
 
   if options.url_list == '':
     logging.error('URL test list required')
@@ skipping 46 matching lines @@
   if len(rebaseline_urls) > 0:
     rebaseline_string = '\n'.join('    ' + url for url in rebaseline_urls)
     logging.warn('RE-BASELINE URLs\n%s\n' % rebaseline_string)
 
   if status == FAIL:
     return 1
   elif status == REBASELINE:
     return REBASELINE_EXIT_CODE
   return 0
 
-if '__main__' == __name__:
+
+def main():
   option_parser = optparse.OptionParser()
   option_parser.add_option('', '--target', default='Debug',
                            help='build target (Debug or Release)')
   option_parser.add_option('', '--cache-dir', default='',
                            help='use a specified cache directory')
   option_parser.add_option('', '--url-list', default='',
                            help='URL input file, with leak expectations, '
                                  'relative to webkit/tools/leak_tests')
   option_parser.add_option('', '--time-out-ms', default=30000,
                            help='time out for each test')
   option_parser.add_option('', '--seed', default=None,
                            help='seed for random number generator, use to '
                                 'reproduce the exact same order for a '
                                 'specific run')
   options, args = option_parser.parse_args()
-  sys.exit(main(options, args))
+  return run_node_leak_test(options, args)
 
+
+if '__main__' == __name__:
+  sys.exit(main())