Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2630)

Unified Diff: appengine/findit/waterfall/test/waterfall_config_test.py

Issue 1497783003: [Findit] Use Findit's own versioned config. (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@versioned_model
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « appengine/findit/model/wf_config.py ('k') | appengine/findit/waterfall/waterfall_config.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: appengine/findit/waterfall/test/waterfall_config_test.py
diff --git a/appengine/findit/waterfall/test/waterfall_config_test.py b/appengine/findit/waterfall/test/waterfall_config_test.py
index cdb27bbf9272fa4c7fde8d34a94ae31150b7ddef..49da9dd30af393728bf78543e71b15a391700526 100644
--- a/appengine/findit/waterfall/test/waterfall_config_test.py
+++ b/appengine/findit/waterfall/test/waterfall_config_test.py
@@ -4,7 +4,7 @@
from testing_utils import testing
-from model import wf_config
+from model.wf_config import FinditConfig
from waterfall import waterfall_config
@@ -13,22 +13,25 @@ class MastersTest(testing.AppengineTestCase):
def setUp(self):
super(MastersTest, self).setUp()
+ self.mock_current_user(user_email='test@chromium.org', is_admin=True)
+
+ config_data = {
+ 'masters_to_blacklisted_steps': {
+ 'master1': ['step1', 'step2', 'step3'],
+ 'master2': ['step4', 'step5', 'step6']
+ },
+ 'builders_to_trybots': {
+ 'master1': {
+ 'builder1': {
+ 'mastername': 'tryserver1',
+ 'buildername': 'trybot1',
+ }
+ }
+ }
+ }
+
+ FinditConfig.Get().Update(**config_data)
- class MockSettings():
- masters_to_blacklisted_steps = {
- 'master1': ['step1', 'step2', 'step3'],
- 'master2': ['step4', 'step5', 'step6']
- }
- builders_to_trybots = {
- 'master1': {
- 'builder1': {
- 'mastername': 'tryserver1',
- 'buildername': 'trybot1',
- }
- }
- }
-
- self.mock(wf_config, 'Settings', MockSettings)
def testMasterIsSupported(self):
self.assertTrue(waterfall_config.MasterIsSupported('master1'))
« no previous file with comments | « appengine/findit/model/wf_config.py ('k') | appengine/findit/waterfall/waterfall_config.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698