From f05b935882198ccf7d81675736e3aeb089c5113a Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 5 May 2011 14:36:32 +0100 Subject: Merge WebKit at r74534: Initial merge by git. Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb --- WebKitTools/QueueStatusServer/__init__.py | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 WebKitTools/QueueStatusServer/__init__.py (limited to 'WebKitTools/QueueStatusServer/__init__.py') diff --git a/WebKitTools/QueueStatusServer/__init__.py b/WebKitTools/QueueStatusServer/__init__.py deleted file mode 100644 index 2346c23..0000000 --- a/WebKitTools/QueueStatusServer/__init__.py +++ /dev/null @@ -1,29 +0,0 @@ -# Required for Python to search this directory for module files - -# This __init__.py makes unit testing easier by allowing us to treat the entire server as one big module. -# This file is only accessed when not on AppEngine itself. - -# Make sure that this module will load in that case by including paths to -# the default Google AppEngine install. - - -def fix_sys_path(): - import sys - import os - - # AppEngine imports a bunch of google-specific modules. Thankfully the dev_appserver - # knows how to do the same. Re-use the dev_appserver fix_sys_path logic to import - # all the google.appengine.* stuff so we can run under test-webkitpy - sys.path.append("/usr/local/google_appengine") - import dev_appserver - dev_appserver.fix_sys_path() - - # test-webkitpy adds $WEBKIT/WebKitTools to the sys.path and imports - # QueueStatusServer to run all the tests. However, when AppEngine runs - # our code QueueStatusServer is the root (and thus in the path). - # Emulate that here for test-webkitpy so that we can import "model." - # not "QueueStatusServer.model.", etc. - sys.path.append(os.path.dirname(__file__)) - - -fix_sys_path() -- cgit v1.1