[Findit] Use Findit's own versioned config.

appengine/findit/handlers/test/config_test.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import json
 
 import webapp2
 
 from handlers import config
 from model import wf_config
@@ skipping 16 matching lines @@
 
 _MOCK_VERSION_NUMBER = 12
 
 
 class ConfigTest(testing.AppengineTestCase):
   app_module = webapp2.WSGIApplication([
       ('/config', config.Configuration),
   ], debug=True)
 
   def testGetConfigurationSettings(self):
-    class MockFinditConfig():
-      masters_to_blacklisted_steps = _MOCK_MASTERS_TO_BLACKLISTED_STEPS
-      builders_to_trybots = _MOCK_BUILDERS_TO_TRYBOTS
+    self.mock_current_user(user_email='test@chromium.org', is_admin=True)
 
-      @property
-      def VersionNumber(self):
-        return _MOCK_VERSION_NUMBER
-
-    def MockSettings():
-      return MockFinditConfig()
-
-    self.mock(wf_config, 'Settings', MockSettings)
-    self.mock_current_user(user_email='test@chromium.org', is_admin=True)
+    config_data = {
+        'masters_to_blacklisted_steps': _MOCK_MASTERS_TO_BLACKLISTED_STEPS,
+        'builders_to_trybots': _MOCK_BUILDERS_TO_TRYBOTS,
+    }
+    wf_config.FinditConfig.Get().Update(**config_data)
 
     response = self.test_app.get('/config', params={'format': 'json'})
     self.assertEquals(response.status_int, 200)
 
     expected_response = {
         'masters': _MOCK_MASTERS_TO_BLACKLISTED_STEPS,
         'builders': _MOCK_BUILDERS_TO_TRYBOTS,
-        'version': _MOCK_VERSION_NUMBER,
+        'version': 1,
     }
 
     self.assertEquals(expected_response, response.json_body)
 
   def testValidateMastersDict(self):
     self.assertTrue(config._SupportedMastersConfigIsValid({
         'a': ['string1', 'string2', 'string3'],
         'b': ['string1', 'string2', 'string3'],
     }))
     self.assertFalse(config._SupportedMastersConfigIsValid({
@@ skipping 26 matching lines @@
         'masters_to_blacklisted_steps': {
             'a': []
         }
     }))
     self.assertFalse(config._ConfigurationDictIsValid([]))
     self.assertFalse(config._ConfigurationDictIsValid({
         'this_is_not_a_valid_property': []
     }))
 
   def testPostConfigurationSettings(self):
-
-    class MockFinditConfig():
-      masters_to_blacklisted_steps = {
-          'a': [],
-      }
-      builders_to_trybots = {}
-
-      def modify(self, **kwargs):
-        for k, v in kwargs.iteritems():
-          setattr(self, k, v)
-
-      @property
-      def VersionNumber(self):
-        return _MOCK_VERSION_NUMBER
-
-    mock_config = MockFinditConfig()
-
-    def MockSettings():
-      return mock_config
-
     self.mock_current_user(user_email='test@chromium.org', is_admin=True)
-    self.mock(wf_config, 'FinditConfig', MockFinditConfig)
-    self.mock(wf_config, 'Settings', MockSettings)
 
     params = {
         'format': 'json',
         'data': json.dumps({
             'masters_to_blacklisted_steps': {
                 'a': ['1', '2', '3'],
-                'b': []
+                'b': [],
             },
             'builders_to_trybots': _MOCK_BUILDERS_TO_TRYBOTS,
         })
     }
 
     expected_response = {
         'masters': {
             'a': ['1', '2', '3'],
             'b': []
         },
         'builders': _MOCK_BUILDERS_TO_TRYBOTS,
-        'version': _MOCK_VERSION_NUMBER,
+        'version': 1,
     }
 
     response = self.test_app.post('/config', params=params)
     self.assertEquals(expected_response, response.json_body)