| Index: appengine/findit/handlers/test/build_failure_test.py
|
| diff --git a/appengine/findit/handlers/test/build_failure_test.py b/appengine/findit/handlers/test/build_failure_test.py
|
| index 66b62155b0a541e04e628ee234275aa8fa427409..c5a906cc8bf00bbc6731cc450587df1e8ab257df 100644
|
| --- a/appengine/findit/handlers/test/build_failure_test.py
|
| +++ b/appengine/findit/handlers/test/build_failure_test.py
|
| @@ -6,19 +6,18 @@ import os
|
| import re
|
|
|
| from google.appengine.ext import testbed
|
| +
|
| import webapp2
|
| import webtest
|
|
|
| -from testing_utils import testing
|
| -
|
| from handlers import build_failure
|
| from handlers import handlers_util
|
| from handlers import result_status
|
| from model.wf_analysis import WfAnalysis
|
| from model import wf_analysis_status
|
| +from model.wf_analysis import WfAnalysis
|
| from waterfall import buildbot
|
| -from waterfall import waterfall_config
|
| -
|
| +from waterfall.test import wf_testcase
|
|
|
| # Root directory appengine/findit.
|
| ROOT_DIR = os.path.join(os.path.dirname(__file__),
|
| @@ -100,7 +99,7 @@ SAMPLE_TRY_JOB_INFO = {
|
| }
|
|
|
|
|
| -class BuildFailureTest(testing.AppengineTestCase):
|
| +class BuildFailureTest(wf_testcase.WaterfallTestCase):
|
| app_module = webapp2.WSGIApplication([
|
| ('/build-failure', build_failure.BuildFailure),
|
| ], debug=True)
|
| @@ -156,17 +155,12 @@ class BuildFailureTest(testing.AppengineTestCase):
|
| self.test_app.get, '/build-failure', params={'url': build_url})
|
|
|
| def testNonAdminCanViewAnalysisOfFailureOnUnsupportedMaster(self):
|
| - master_name = 'm'
|
| + master_name = 'm2'
|
| builder_name = 'b 1'
|
| build_number = 123
|
| build_url = buildbot.CreateBuildUrl(
|
| master_name, builder_name, build_number)
|
|
|
| - def MockMasterIsSupported(*_):
|
| - return False
|
| - self.mock(waterfall_config, 'MasterIsSupported',
|
| - MockMasterIsSupported)
|
| -
|
| analysis = WfAnalysis.Create(master_name, builder_name, build_number)
|
| analysis.status = wf_analysis_status.ANALYZED
|
| analysis.put()
|
| @@ -177,16 +171,12 @@ class BuildFailureTest(testing.AppengineTestCase):
|
| self.assertEqual(0, len(self.taskqueue_stub.get_filtered_tasks()))
|
|
|
| def testNonAdminCannotRequestAnalysisOfFailureOnUnsupportedMaster(self):
|
| - master_name = 'm'
|
| + master_name = 'm2'
|
| builder_name = 'b 1'
|
| build_number = 123
|
| build_url = buildbot.CreateBuildUrl(
|
| master_name, builder_name, build_number)
|
|
|
| - def MockMasterIsSupported(*_):
|
| - return False
|
| - self.mock(waterfall_config, 'MasterIsSupported', MockMasterIsSupported)
|
| -
|
| self.assertRaisesRegexp(
|
| webtest.app.AppError,
|
| re.compile('.*501 Not Implemented.*Master "%s" '
|
| @@ -195,16 +185,12 @@ class BuildFailureTest(testing.AppengineTestCase):
|
| self.test_app.get, '/build-failure', params={'url': build_url})
|
|
|
| def testAdminCanRequestAnalysisOfFailureOnUnsupportedMaster(self):
|
| - master_name = 'm'
|
| + master_name = 'm2'
|
| builder_name = 'b'
|
| build_number = 123
|
| build_url = buildbot.CreateBuildUrl(
|
| master_name, builder_name, build_number)
|
|
|
| - def MockMasterIsSupported(*_):
|
| - return False
|
| - self.mock(waterfall_config, 'MasterIsSupported', MockMasterIsSupported)
|
| -
|
| self.mock_current_user(user_email='test@chromium.org', is_admin=True)
|
|
|
| response = self.test_app.get('/build-failure', params={'url': build_url})
|
| @@ -219,10 +205,6 @@ class BuildFailureTest(testing.AppengineTestCase):
|
| build_url = buildbot.CreateBuildUrl(
|
| master_name, builder_name, build_number)
|
|
|
| - def MockMasterIsSupported(*_):
|
| - return True
|
| - self.mock(waterfall_config, 'MasterIsSupported', MockMasterIsSupported)
|
| -
|
| response = self.test_app.get('/build-failure', params={'url': build_url})
|
| self.assertEquals(200, response.status_int)
|
|
|
|
|