[Findit] Bailing out if build data is too old and moving relevant settings to config

appengine/findit/waterfall/test/build_util_test.py

Index: appengine/findit/waterfall/test/build_util_test.py
diff --git a/appengine/findit/waterfall/test/build_util_test.py b/appengine/findit/waterfall/test/build_util_test.py
index 31a9828d4e14334bd570ccedabf54399c702f8a4..03b8da933e73fe49f40e67457b3f2cf190221d71 100644
--- a/appengine/findit/waterfall/test/build_util_test.py
+++ b/appengine/findit/waterfall/test/build_util_test.py
@@ -7,11 +7,12 @@ import datetime
 from testing_utils import testing
 
 from model.wf_build import WfBuild
-from waterfall import buildbot
 from waterfall import build_util
+from waterfall import buildbot
+from waterfall.test import wf_testcase
 
 
-class BuildUtilTest(testing.AppengineTestCase):
+class BuildUtilTest(wf_testcase.WaterfallTestCase):
 
   def setUp(self):
     super(BuildUtilTest, self).setUp()
@@ -53,18 +54,18 @@ class BuildUtilTest(testing.AppengineTestCase):
       self, master_name, builder_name, build_number,
       build_data=None, archive=False):
     if archive and build_data == 'Test get build data':
-      build_data = build_data + ' from archive'
+      build_data += ' from archive'
       archived_build_url = buildbot.CreateArchivedBuildUrl(
           master_name, builder_name, build_number)
       self.mocked_urlfetch.register_handler(archived_build_url, build_data)
 
     if build_data == 'Test get build data':
-      build_data = build_data + ' from build master'
+      build_data += ' from build master'
     build_url = buildbot.CreateBuildUrl(
         master_name, builder_name, build_number, json_api=True)
     self.mocked_urlfetch.register_handler(build_url, build_data)
 
-  def testGetBuildeDataNotDownloadAgain(self):
+  def testGetBuildDataNotDownloadAgain(self):
     master_name = 'm'
     builder_name = 'b'
     build_number = 123
@@ -82,7 +83,7 @@ class BuildUtilTest(testing.AppengineTestCase):
 
     self.assertEqual(expected_build_data, build.data)
 
-  def testGetBuildeDataFromArchive(self):
+  def testGetBuildDataFromArchive(self):
     master_name = 'm'
     builder_name = 'b'
     build_number = 123
@@ -100,7 +101,7 @@ class BuildUtilTest(testing.AppengineTestCase):
 
     self.assertEqual(expected_build_data, build.data)
 
-  def testGetBuildeDataFromBuildMaster(self):
+  def testGetBuildDataFromBuildMaster(self):
     master_name = 'm'
     builder_name = 'b'
     build_number = 123
@@ -113,3 +114,36 @@ class BuildUtilTest(testing.AppengineTestCase):
     expected_build_data = 'Test get build data from build master'
 
     self.assertEqual(expected_build_data, build.data)
+
+  def testDownloadBuildDataSourceFromCBE(self):
+    master_name = 'm'
+    builder_name = 'b'
+    build_number = 123
+    build = WfBuild.Create(master_name, builder_name, build_number)
+    build.put()
+
+    self.UpdateUnitTestConfigSettings(
+        'download_build_data_settings', {'use_chrome_build_extract': True})
+    self._MockUrlfetchWithBuildData(master_name, builder_name, build_number,
+                                    build_data='Test get build data',
+                                    archive=True)
+
+    build_util.DownloadBuildData(master_name, builder_name, build_number)
+
+    self.assertEqual(build.data_source, build_util.CHROME_BUILD_EXTRACT)
+
+  def testDownloadBuildDataSourceFromBM(self):
+    master_name = 'm'
+    builder_name = 'b'
+    build_number = 123
+    build = WfBuild.Create(master_name, builder_name, build_number)
+    build.put()
+
+    self.UpdateUnitTestConfigSettings(
+        'download_build_data_settings', {'use_chrome_build_extract': False})
+    self._MockUrlfetchWithBuildData(master_name, builder_name, build_number,
+                                    build_data='Test get build data')
+
+    build_util.DownloadBuildData(master_name, builder_name, build_number)
+
+    self.assertEqual(build.data_source, build_util.BUILDBOT_MASTER)