| 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 71399d30a60bafc00a27cc7750f31e7e1691aa28..1707435eb5b318317acccaa5d9efe915ab774900 100644
|
| --- a/appengine/findit/handlers/test/build_failure_test.py
|
| +++ b/appengine/findit/handlers/test/build_failure_test.py
|
| @@ -12,10 +12,10 @@ import webtest
|
| from testing_utils import testing
|
|
|
| from handlers import build_failure
|
| -from model.wf_analysis import WfAnalysis
|
| from model import wf_analysis_status
|
| +from model.test import configured_test_case
|
| +from model.wf_analysis import WfAnalysis
|
| from waterfall import buildbot
|
| -from waterfall import waterfall_config
|
|
|
|
|
| # Root directory appengine/findit.
|
| @@ -80,11 +80,6 @@ class BuildFailureTest(testing.AppengineTestCase):
|
| 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()
|
| @@ -101,10 +96,6 @@ class BuildFailureTest(testing.AppengineTestCase):
|
| 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" '
|
| @@ -119,10 +110,6 @@ class BuildFailureTest(testing.AppengineTestCase):
|
| 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})
|
| @@ -136,10 +123,9 @@ class BuildFailureTest(testing.AppengineTestCase):
|
| build_number = 123
|
| build_url = buildbot.CreateBuildUrl(
|
| master_name, builder_name, build_number)
|
| -
|
| - def MockMasterIsSupported(*_):
|
| - return True
|
| - self.mock(waterfall_config, 'MasterIsSupported', MockMasterIsSupported)
|
| + self.mock_current_user(user_email='test@chromium.org', is_admin=True)
|
| + configured_test_case.MockConfigSettings()
|
| + self.mock_current_user(user_email='anyone@chromium.org', is_admin=False)
|
|
|
| response = self.test_app.get('/build-failure', params={'url': build_url})
|
| self.assertEquals(200, response.status_int)
|
|
|