| Index: Tools/TestResultServer/handlers/testfilehandler_test.py
|
| diff --git a/Tools/TestResultServer/handlers/testfilehandler_test.py b/Tools/TestResultServer/handlers/testfilehandler_test.py
|
| index 8b108c4bd16cbd51ebf21da88a1aba72cb1cbe2a..a80087af59c8366c564857569beae0f229c6975c 100755
|
| --- a/Tools/TestResultServer/handlers/testfilehandler_test.py
|
| +++ b/Tools/TestResultServer/handlers/testfilehandler_test.py
|
| @@ -5,50 +5,34 @@
|
| # found in the LICENSE file.
|
|
|
| import collections
|
| -import json
|
| import imp
|
| +import json
|
| import logging
|
| import os
|
| import sys
|
| import unittest
|
|
|
| -assert 'GAE_SDK_ROOT' in os.environ, ('''
|
| -You must set the environment variable GAE_SDK_ROOT to point to the
|
| -root of your google_appengine SDK installation before running the tests.''')
|
| -
|
| -os.environ.setdefault('APPENGINE_RUNTIME', 'python27')
|
| -
|
| -try:
|
| - wrapper_util = imp.load_module(
|
| - 'wrapper_util', *imp.find_module(
|
| - 'wrapper_util', [os.environ['GAE_SDK_ROOT']]))
|
| -except ImportError:
|
| - print >> sys.stderr, 'GAE_SDK_ROOT=%s does not look like the root of an appengine SDK installation.' % os.environ['GAE_SDK_ROOT']
|
| - raise
|
| -
|
| -APP_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
| -sys.path = wrapper_util.Paths(os.environ['GAE_SDK_ROOT']).v1_extra_paths + sys.path
|
| -sys.path.append(APP_ROOT)
|
| -
|
| +# AppEngine modules
|
| +sys.path.append(os.path.join(os.path.abspath(__file__), '..', '..'))
|
| +import appengine_testing
|
| +appengine_testing.set_up()
|
| import webapp2
|
| -
|
| -try:
|
| - import webtest
|
| -except ImportError:
|
| - print "ERROR: Could not load webtest python module. You may need to 'sudo apt-get python-webtest'."
|
| - raise
|
| +import webtest
|
|
|
| from google.appengine.ext import blobstore
|
| from google.appengine.ext import db
|
| from google.appengine.ext import testbed
|
|
|
| +# App modules
|
| +APP_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
| +sys.path.append(APP_ROOT)
|
| +
|
| from handlers import master_config
|
| from handlers import testfilehandler
|
| from model.jsonresults import *
|
|
|
|
|
| class TestFileHandlerTest(unittest.TestCase):
|
| -
|
| APP_MAIN_MODULE = imp.load_module('app_main', *imp.find_module('main', [APP_ROOT]))
|
|
|
| def setUp(self):
|
|
|