| 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 1e4d53e18318fad640967670151737992d6cc11f..2f1563886a97741815a9f05e16d5a677b8a45d2c 100644 | 
| --- a/appengine/findit/waterfall/test/waterfall_config_test.py | 
| +++ b/appengine/findit/waterfall/test/waterfall_config_test.py | 
| @@ -2,67 +2,11 @@ | 
| # Use of this source code is governed by a BSD-style license that can be | 
| # found in the LICENSE file. | 
|  | 
| -from testing_utils import testing | 
| - | 
| -from model.wf_config import FinditConfig | 
| +from model.test import configured_test_case | 
| from waterfall import waterfall_config | 
|  | 
|  | 
| -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 = { | 
| -        'steps_for_masters_rules': { | 
| -            'supported_masters': { | 
| -                'master1': { | 
| -                    # supported_steps override global. | 
| -                    'supported_steps': ['step6'], | 
| -                    'unsupported_steps': ['step1', 'step2', 'step3'], | 
| -                }, | 
| -                'master2': { | 
| -                    # Only supports step4 and step5 regardless of global. | 
| -                    'supported_steps': ['step4', 'step5'], | 
| -                    'check_global': False | 
| -                }, | 
| -                'master3': { | 
| -                    # Supports everything not blacklisted in global. | 
| -                }, | 
| -            }, | 
| -            'global': { | 
| -                # Blacklists all listed steps for all masters unless overridden. | 
| -                'unsupported_steps': ['step6', 'step7'], | 
| -            } | 
| -        }, | 
| -        'builders_to_trybots': { | 
| -            'master1': { | 
| -                'builder1': { | 
| -                    'mastername': 'tryserver1', | 
| -                    'buildername': 'trybot1', | 
| -                    'strict_regex': True, | 
| -                } | 
| -            } | 
| -        }, | 
| -        'try_job_settings': { | 
| -            'server_query_interval_seconds': 60, | 
| -            'job_timeout_hours': 5, | 
| -            'allowed_response_error_times': 1 | 
| -        }, | 
| -        'swarming_settings': { | 
| -            'server_host': 'chromium-swarm.appspot.com', | 
| -            'default_request_priority': 150, | 
| -            'request_expiration_hours': 20, | 
| -            'server_query_interval_seconds': 60, | 
| -            'task_timeout_hours': 23, | 
| -            'isolated_server': 'https://isolateserver.appspot.com', | 
| -            'isolated_storage_url': 'isolateserver.storage.googleapis.com', | 
| -            'iterations_to_rerun': 10 | 
| -        } | 
| -    } | 
| - | 
| -    FinditConfig.Get().Update(**config_data) | 
| +class MastersTest(configured_test_case.ConfiguredTestCase): | 
|  | 
| def testConvertOldMastersFormatToNew(self): | 
| self.assertEqual( | 
| @@ -134,7 +78,7 @@ class MastersTest(testing.AppengineTestCase): | 
| { | 
| 'server_query_interval_seconds': 60, | 
| 'job_timeout_hours': 5, | 
| -            'allowed_response_error_times': 1 | 
| +            'allowed_response_error_times': 5 | 
| }, | 
| waterfall_config.GetTryJobSettings()) | 
|  | 
|  |