Get test_webkitpy to actually run again.

sky/tools/webkitpy/test/main.py

 # Copyright (C) 2012 Google, Inc.
 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org)
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1.  Redistributions of source code must retain the above copyright
 #     notice, this list of conditions and the following disclaimer.
 # 2.  Redistributions in binary form must reproduce the above copyright
 #     notice, this list of conditions and the following disclaimer in the
@@ skipping 33 matching lines @@
 
 
 up = os.path.dirname
 webkit_root = up(up(up(up(up(os.path.abspath(__file__))))))
 
 
 def main():
     filesystem = FileSystem()
     wkf = WebKitFinder(filesystem)
     tester = Tester(filesystem, wkf)
-    tester.add_tree(wkf.path_from_webkit_base('Tools', 'Scripts'), 'webkitpy')
+    tester.add_tree(wkf.path_from_webkit_base('tools'), 'webkitpy')
 
     tester.skip(('webkitpy.common.checkout.scm.scm_unittest',), 'are really, really, slow', 31818)
     if sys.platform == 'win32':
         tester.skip(('webkitpy.common.checkout', 'webkitpy.common.config', 'webkitpy.tool', 'webkitpy.w3c', 'webkitpy.layout_tests.layout_package.bot_test_expectations'), 'fail horribly on win32', 54526)
 
-    # This only needs to run on Unix, so don't worry about win32 for now.
-    appengine_sdk_path = '/usr/local/google_appengine'
-    if os.path.exists(appengine_sdk_path):
-        if not appengine_sdk_path in sys.path:
-            sys.path.append(appengine_sdk_path)
-        import dev_appserver
-        from google.appengine.dist import use_library
-        use_library('django', '1.2')
-        dev_appserver.fix_sys_path()
-        tester.add_tree(wkf.path_from_webkit_base('Tools', 'TestResultServer'))
-    else:
-        _log.info('Skipping TestResultServer tests; the Google AppEngine Python SDK is not installed.')
-
     return not tester.run()
 
 
 class Tester(object):
     def __init__(self, filesystem=None, webkit_finder=None):
         self.filesystem = filesystem or FileSystem()
         self.executive = Executive()
         self.finder = Finder(self.filesystem)
         self.printer = Printer(sys.stderr)
         self.webkit_finder = webkit_finder or WebKitFinder(self.filesystem)
@@ skipping 28 matching lines @@
         return parser.parse_args(argv)
 
     def run(self):
         argv = sys.argv[1:]
         self._options, args = self._parse_args(argv)
 
         # Make sure PYTHONPATH is set up properly.
         sys.path = self.finder.additional_paths(sys.path) + sys.path
 
         # FIXME: coverage needs to be in sys.path for its internal imports to work.
-        thirdparty_path = self.webkit_finder.path_from_webkit_base('Tools', 'Scripts', 'webkitpy', 'thirdparty')
+        thirdparty_path = self.webkit_finder.path_from_webkit_base('tools', 'webkitpy', 'thirdparty')
         if not thirdparty_path in sys.path:
             sys.path.append(thirdparty_path)
 
         self.printer.configure(self._options)
 
         # Do this after configuring the printer, so that logging works properly.
         if self._options.coverage:
             argv = ['-j', '1'] + [arg for arg in argv if arg not in ('-c', '--coverage', '-j', '--child-processes')]
             _log.warning('Checking code coverage, so running things serially')
             return self._run_under_coverage(argv)
@@ skipping 77 matching lines @@
     def _log_exception(self):
         s = StringIO.StringIO()
         traceback.print_exc(file=s)
         for l in s.buflist:
             _log.error('  ' + l.rstrip())
 
 
 
 if __name__ == '__main__':
     sys.exit(main())