Keep track of hashes triggered instead of builds.

scripts/slave/unittests/gatekeeper_ng_test.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 """Unit tests for gatekeeper_ng.py.
 
 This is a basic check that gatekeeper_ng.py can properly interpret builds and
 close the tree.
 
@@ skipping 214 matching lines @@
   def create_generic_build_tree(self, master_title, master_url_chunk):
     build = GatekeeperTest.create_generic_build(1, ['a_committer@chromium.org'])
 
     builder = Builder('mybuilder', [build])
 
     return Master(master_title, self.master_url_root + master_url_chunk,
                   [builder])
 
   def call_gatekeeper(self):
     """Sets up handlers for all the json and actually calls gatekeeper."""
+    self.url_calls = []
     self.handle_build_tree(self.masters)
     ret = gatekeeper_ng.main()
     if ret != 0:
       raise ValueError('return code was %d' % ret)
 
     # Return urls as a convenience.
     return [call['url'] for call in self.url_calls]
 
   @contextlib.contextmanager
   def gatekeeper_config_editor(self):
@@ skipping 105 matching lines @@
                                 {})
 
     urls = self.call_gatekeeper()
     self.assertEquals(urls, [self.masters[0].url + '/json'])
 
   def testIgnoreSuccessfulBuildNoGatekeeperSteps(self):
     """If gatekeeper_spec doesn't have any annotations, don't fail build."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',

[iannucci, 2014/02/20 03:30:55]

nope

[ghost stip (do not use), 2014/02/22 10:03:07]

Done.

                      '--email-app-secret-file=%s' % self.email_secret_file])
 
 
     self.handle_build_tree([self.masters[0]])
     gatekeeper_ng.main()
     urls = [call['url'] for call in self.url_calls]
     self.assertNotIn(self.mailer_url, urls)
 
   def testFailedBuildDetected(self):
     """Test that an erroneous build result closes the tree."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].results = 3
     self.add_gatekeeper_master_config(self.masters[0].url,
                                       {'respect_build_status': True})
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {},
                                 idx=0)
 
     self.handle_url_str(self.mailer_url, '')
 
     self.handle_build_tree([self.masters[0]])
     gatekeeper_ng.main()
 
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testFailedBuildNoEmail(self):
     """Test that no email is sent if there are no watchers."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
 
     self.masters[0].builders[0].builds[0].results = 3
     self.masters[0].builders[0].builds[0].blame = []
     self.add_gatekeeper_master_config(self.masters[0].url,
                                       {'respect_build_status': True})
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {},
                                 idx=0)
 
 
     urls = self.call_gatekeeper()
     self.assertNotIn(self.mailer_url, urls)
 
 
   def testStepNonCloserFailureIgnored(self):
     """Test that a non-closing failure is ignored."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[2].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']})
 
     urls = self.call_gatekeeper()
     self.assertNotIn(self.mailer_url, urls)
 
   def testStepCloserFailureDetected(self):
     """Test that a failed closing step closes the tree."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']})
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testStepCloserFailureOptional(self):
     """Test that a failed closing_optional step closes the tree."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_optional': ['step1']})
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testStepCloserFailureOptionalStar(self):
     """Test that a failed closing_optional * step closes the tree."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_optional': ['*']})
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testStepOmissionDetected(self):
     """Test that the lack of a closing step closes the tree."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step4']})
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testStepOmissionOptional(self):
     """Test that the lack of a closing_optional step doesn't close the tree."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_optional': ['step4']})
 
     self.call_gatekeeper()
     urls = self.call_gatekeeper()
     self.assertNotIn(self.status_url, urls)
     self.assertNotIn(self.mailer_url, urls)
 
   def testStepForgivingOmissionOptional(self):
     """Test that the lack of a forgiving_optional step doesn't close tree."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'forgiving_optional': ['step4']})
 
     self.call_gatekeeper()
 
     urls = self.call_gatekeeper()
     self.assertNotIn(self.status_url, urls)
     self.assertNotIn(self.mailer_url, urls)
 
   def testStepNotStarted(self):
     """Test that a skipped closing step closes the tree."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']})
 
     self.masters[0].builders[0].builds[0].steps[1].isStarted = False
     self.masters[0].builders[0].builds[0].steps[1].isFinished = False
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testGatekeeperOOO(self):
     """Test that gatekeeper_spec works even if not the first step."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']})
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
 
     spec = self.masters[0].builders[0].builds[0].steps
     self.masters[0].builders[0].builds[0].steps = spec[1:]+spec[:1]
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testFailedBuildClosesTree(self):
     """Test that a failed build calls to the status app."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--no-email-app', '--set-status',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--password-file', self.status_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']})
 
     urls = self.call_gatekeeper()
     self.assertIn(self.status_url, urls)
 
   def testIgnoredStepsDontCloseTree(self):
     """Test that ignored steps don't call to the status app."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--no-email-app', '--set-status',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--password-file', self.status_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step2']})
 
     self.handle_url_str(self.status_url, 'the status')
 
     urls = self.call_gatekeeper()
     self.assertNotIn(self.status_url, urls)
 
   def testDefaultSubjectTemplate(self):
     """Test that the subject template is set by default."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step4']})
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['subject_template'], unicode(
         'buildbot %(result)s in %(projectName)s on %(builder)s, '
         'revision %(revision)s'))
 
 
   def testEmailJson(self):
     """Test that the email json is formatted correctly."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     subject_template = 'build %(result)s, oh no!'
     self.masters[0].builders[0].builds[0].results = 3
     self.add_gatekeeper_master_config(self.masters[0].url,
                                       {'respect_build_status': True})
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'subject_template': subject_template},
                                 idx=0)
@@ skipping 38 matching lines @@
     self.assertEquals(mailer_data['from_addr'], 'buildbot@chromium.org')
     self.assertEquals(mailer_data['subject_template'],
                       unicode(subject_template))
 
 
   #### BuildDB operation.
 
   def testIncrementalScanning(self):
     """Test that builds in the build DB are skipped."""
     fd, dbfilename = tempfile.mkstemp()
-    build_db = {self.masters[0].url: { 'mybuilder': 1 }}
+    build_db = {'build_db_version': gatekeeper_ng.BUILD_DB_VERSION,
+                'sections': {},
+                'masters': {
+                    self.masters[0].url: { 'mybuilder': [{'build': 1,
+                                                          'finished': True}] }
+                }
+               }
     os.write(fd, json.dumps(build_db))
     os.close(fd)
 
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--build-db=%s' % dbfilename,
                      '--json', self.gatekeeper_file,
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
 
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']})
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
 
     self.masters[0].builders[0].builds.append(
         GatekeeperTest.create_generic_build(2,[
             'a_second_committer@chromium.org']))
     self.masters[0].builders[0].builds[1].steps[1].results = [2, None]
 
     @contextlib.contextmanager
     def delfile(filename):
       yield
       os.unlink(filename)
 
     with delfile(dbfilename):
       self.call_gatekeeper()
       with open(dbfilename) as f:
         new_build_db = json.load(f)
-    self.assertEquals(new_build_db, {self.masters[0].url: {'mybuilder': 2}})
+    finished_new_builds = [
+        b for b in new_build_db['masters'][self.masters[0].url]['mybuilder'] if
+        b.get('finished')]
+    self.assertEquals(finished_new_builds,
+                      [{'build': 2,
+                        'finished': True,
+                        'triggered': ['2be9f9320c2d26b09e416d615ff047'
+                                      '86abc74794bd5b669a1bb4228f884ddf50']}])
 
-    #check that gatekeeper indeed sent an email.
+    # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'],
                       ['a_second_committer@chromium.org'])
     urls = [call['url'] for call in self.url_calls]
     self.assertEquals(urls.count(self.mailer_url), 1)
 
 
   #### Gatekeeper parsing.
 
   def testSheriffParsing(self):
     """Test that sheriff annotations are properly parsed."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1'],
                                  'sheriff_classes': ['sheriff_android']})
 
 
     sheriff_url = 'http://build.chromium.org/p/chromium/sheriff_android.js'
@@ skipping 12 matching lines @@
     self.assertEquals(mailer_data['recipients'],
                       ['a_committer@chromium.org',
                        'anothersheriff@google.com',
                        'asheriff@google.com'])
 
   def testNoSheriff(self):
     """Test that a no-sheriff condition works OK (weekends)."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].blame = []
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
 
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1'],
                                  'sheriff_classes': ['sheriff_android']})
 
     sheriff_url = 'http://build.chromium.org/p/chromium/sheriff_android.js'
     sheriff_string = 'document.write(\'None (channel is sheriff)\')'
     self.handle_url_str(sheriff_url, sheriff_string)
 
     self.call_gatekeeper()
 
     self.assertEquals(self.url_calls[-1]['url'], sheriff_url)
 
     urls = [call['url'] for call in self.url_calls]
     self.assertNotIn(self.mailer_url, urls)
 
   def testNoSheriffButBlame(self):
     """Test that no-sheriff works ok with a blamelist."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1'],
                                  'sheriff_classes': ['sheriff_android']})
 
     sheriff_url = 'http://build.chromium.org/p/chromium/sheriff_android.js'
     sheriff_string = 'document.write(\'None (channel is sheriff)\')'
     self.handle_url_str(sheriff_url, sheriff_string)
 
     self.call_gatekeeper()
 
     self.assertEquals(self.url_calls[-2]['url'], sheriff_url)
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testMultiSheriff(self):
     """Test that multiple sheriff lists can be merged."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1'],
                                  'sheriff_classes': ['sheriff_android',
                                                      'sheriff']})
 
     sheriff_url = 'http://build.chromium.org/p/chromium/sheriff_android.js'
     sheriff_string = 'document.write(\'asheriff, anothersheriff\')'
@@ skipping 17 matching lines @@
                       ['a_committer@chromium.org',
                        'anothersheriff@google.com',
                        'asheriff@google.com',
                        'athirdsheriff@google.com'])
 
   def testNotifyParsing(self):
     """Test that additional watchers can be merged to the mailing list."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1'],
                                  'tree_notify': ['a_watcher@chromium.org']})
 
     sheriff_url = 'http://build.chromium.org/p/chromium/sheriff_android.js'
     sheriff_string = 'document.write(\'asheriff, anothersheriff\')'
     self.handle_url_str(sheriff_url, sheriff_string)
 
     self.call_gatekeeper()
 
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
 
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     mailer_data['recipients'].sort()
     self.assertEquals(mailer_data['recipients'],
                       ['a_committer@chromium.org',
                        'a_watcher@chromium.org'])
 
   def testNotifyNoBlame(self):
     """Test that notify works with no blamelist."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].blame = []
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1'],
                                  'tree_notify': ['a_watcher@chromium.org']})
 
     self.call_gatekeeper()
 
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
 
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     mailer_data['recipients'].sort()
     self.assertEquals(mailer_data['recipients'], ['a_watcher@chromium.org'])
 
   def testForgivingSteps(self):
     """Test that forgiving steps set status but don't email blamelist."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file,
                      '--set-status', '--password-file', self.status_secret_file
                      ])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'forgiving_steps': ['step1']})
     urls = self.call_gatekeeper()
 
     self.assertNotIn(self.mailer_url, urls)
     self.assertIn(self.status_url, urls)
 
   def testForgivingOptional(self):
     """Test that forgiving_optional steps set status but don't email."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file,
                      '--set-status', '--password-file', self.status_secret_file
                      ])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'forgiving_optional': ['step1']})
     urls = self.call_gatekeeper()
 
     self.assertNotIn(self.mailer_url, urls)
     self.assertIn(self.status_url, urls)
 
   def testForgivingOptionalStar(self):
     """Test that forgiving_optional * sets status but doesn't email."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file,
                      '--set-status', '--password-file', self.status_secret_file
                      ])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'forgiving_optional': ['*']})
     urls = self.call_gatekeeper()
 
     self.assertNotIn(self.mailer_url, urls)
     self.assertIn(self.status_url, urls)
 
   def testForgiveAllSteps(self):
     """Test that setting forgive_all prevents emailing the blamelist."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file,
                      '--set-status', '--password-file', self.status_secret_file
                      ])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1'],
                                  'forgive_all': 'true'})
     urls = self.call_gatekeeper()
 
     self.assertNotIn(self.mailer_url, urls)
     self.assertIn(self.status_url, urls)
 
   def testForgiveAllOptionalSteps(self):
     """Test that setting forgive_all prevents emailing the blamelist."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file,
                      '--set-status', '--password-file', self.status_secret_file
                      ])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_optional': ['step1'],
                                  'forgive_all': 'true'})
     urls = self.call_gatekeeper()
 
     self.assertNotIn(self.mailer_url, urls)
     self.assertIn(self.status_url, urls)
 
   #### Multiple failures.
 
   def testSequentialFailures(self):
     """Test that the status app is only hit once if many failures are seen."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file,
                      '--set-status', '--password-file', self.status_secret_file
                      ])
 
     new_build = self.create_generic_build(2,
                                           ['a_second_committer@chromium.org'])
     self.masters[0].builders[0].builds.append(new_build)
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
@@ skipping 13 matching lines @@
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'],
                       ['a_second_committer@chromium.org'])
 
   def testSequentialOneFailure(self):
     """Test that failing builds aren't mixed with good ones."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file,
                      '--set-status', '--password-file', self.status_secret_file
                      ])
 
     new_build = self.create_generic_build(2,
                                           ['a_second_committer@chromium.org'])
     self.masters[0].builders[0].builds.append(new_build)
 
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']})
 
     self.masters[0].builders[0].builds[1].steps[1].results = [2, None]
 
     urls = self.call_gatekeeper()
     self.assertEquals(urls.count(self.status_url), 1)
     self.assertEquals(urls.count(self.mailer_url), 1)
 
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'],
                       ['a_second_committer@chromium.org'])
 
   def testStarBuilder(self):
     """Test that * captures failures across all builders."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.add_gatekeeper_section(self.masters[0].url,
                                 '*',
                                 {'closing_steps': ['step4']})
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testStarBuilderOverride(self):
     """Test that * can be explicitly overridden."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     # step3 won't fail the build.
     self.add_gatekeeper_section(self.masters[0].url,
                                 '*',
                                 {'closing_steps': ['step3']})
 
     # But step4 will.
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step4']},
                                 idx=0)
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testStarBuilderNoPropagate(self):
     """Test that * doesn't propagate to other builders."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     # step4 will fail the build.
     self.add_gatekeeper_section(self.masters[0].url,
                                 '*',
                                 {'closing_steps': ['step4']})
 
     # But step3 won't.
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step3']},
                                 idx=0)
 
     urls = self.call_gatekeeper()
 
     self.assertNotIn(self.mailer_url, urls)
 
   def testMultiBuilderOneFailure(self):
     """Test that failure in one build doesn't affect another."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file,
                      '--set-status', '--password-file', self.status_secret_file
                      ])
 
     new_build = self.create_generic_build(2,
                                           ['a_second_committer@chromium.org'])
     self.masters[0].builders.append(Builder('mybuilder2', [new_build]))
 
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
@@ skipping 14 matching lines @@
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'],
                       ['a_second_committer@chromium.org'])
 
   def testMultiBuilderFailures(self):
     """Test that failures on several builders are handled properly."""
     master_url = 'http://build.chromium.org/p/chromium.fyi'
     sys.argv.extend([master_url,
                      '--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file,
                      '--set-status', '--password-file', self.status_secret_file
                      ])
 
     new_build = self.create_generic_build(2,
                                           ['a_second_committer@chromium.org'])
     self.masters[0].builders.append(Builder('mybuilder2', [new_build]))
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
@@ skipping 20 matching lines @@
                       ['a_second_committer@chromium.org'])
 
   def testMultiMaster(self):
     """Test that multiple master failures are handled properly."""
     self.masters.append(self.create_generic_build_tree('Chromium FYI 2',
                                                        'chromium2.fyi'))
 
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file,
                      '--set-status', '--password-file', self.status_secret_file
                      ])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']})
 
     self.masters[1].builders[0].builds[0].blame = [
@@ skipping 17 matching lines @@
     self.assertEquals(mailer_data['recipients'],
                       ['a_second_committer@chromium.org'])
 
   #### Partial builds (still running).
 
   def testDontFailOmissionOnUncompletedBuild(self):
     """Don't fail a running build because of omitted steps."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--no-email-app', '--set-status',
                      '--password-file', self.status_secret_file])
 
     self.masters[0].builders[0].builds[0].steps.append(
         BuildStep('step4', [], isStarted=True, isFinished=True))
     mybuild = self.create_generic_build(2, ['a_second_committer@chromium.org'])
     mybuild.finished = False
     self.masters[0].builders[0].builds.append(mybuild)
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step4']})
 
     urls = self.call_gatekeeper()
     self.assertNotIn(self.status_url, urls)
 
   def testFailedBuildInProgress(self):
     """Test that a still-running build can close the tree."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--no-email-app', '--set-status',
                      '--password-file', self.status_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']})
     mybuild = self.create_generic_build(2, ['a_second_committer@chromium.org'])
     mybuild.finished = False
     self.masters[0].builders[0].builds.append(mybuild)
 
     urls = self.call_gatekeeper()
     self.assertIn(self.status_url, urls)
 
   def testUpdateBuildDBNotCompletedButFailed(self):
     """Test that partial builds increment the DB if they failed."""
     fd, dbfilename = tempfile.mkstemp()
-    build_db = {self.masters[0].url: { 'mybuilder': 1 }}
+    build_db = {'build_db_version': gatekeeper_ng.BUILD_DB_VERSION,
+                'sections': {},
+                'masters': {
+                    self.masters[0].url: { 'mybuilder': [{'build': 1,
+                                                          'finished': True}] }
+                }
+               }
     os.write(fd, json.dumps(build_db))
     os.close(fd)
 
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--build-db=%s' % dbfilename,
                      '--json', self.gatekeeper_file,
                      '--no-email-app', '--set-status',
                      '--password-file', self.status_secret_file])
 
     mybuild = self.create_generic_build(2, ['a_second_committer@chromium.org'])
     mybuild.steps[1].results = [2, None]
     mybuild.finished = False
     self.masters[0].builders[0].builds.append(mybuild)
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']})
 
     @contextlib.contextmanager
     def delfile(filename):
       yield
       os.unlink(filename)
 
     with delfile(dbfilename):
       urls = self.call_gatekeeper()
       with open(dbfilename) as f:
         new_build_db = json.load(f)
-    self.assertEquals(new_build_db, {self.masters[0].url: {'mybuilder': 2}})
+    finished_new_builds = [
+        b for b in new_build_db['masters'][self.masters[0].url]['mybuilder'] if
+        b.get('finished')]
+    self.assertEquals(finished_new_builds,
+                      [{'build': 1, 'finished': True}])
+    unfinished_new_builds = [
+        b for b in new_build_db['masters'][self.masters[0].url]['mybuilder']
+        if not b.get('finished')]
+    self.assertEquals(unfinished_new_builds,
+                      [{'build': 2, 'triggered': [
+                          '2be9f9320c2d26b09e416d615'
+                          'ff04786abc74794bd5b669a1bb4228f884ddf50']}])
+
     self.assertIn(self.status_url, urls)
 
   def testDontUpdateBuildDBIfNotCompleted(self):
-    """Test that partial builds don't increment the DB if still running."""
+    """Test that partial builds aren't marked as finished."""
     fd, dbfilename = tempfile.mkstemp()
-    build_db = {self.masters[0].url: { 'mybuilder': 1 }}
+    build_db = {'build_db_version': gatekeeper_ng.BUILD_DB_VERSION,
+                'sections': {},
+                'masters': {
+                    self.masters[0].url: { 'mybuilder': [{'build': 1,
+                                                          'finished': True}] }
+                }
+               }
     os.write(fd, json.dumps(build_db))
     os.close(fd)
 
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--build-db=%s' % dbfilename,
                      '--json', self.gatekeeper_file,
                      '--no-email-app', '--set-status',
                      '--password-file', self.status_secret_file])
 
     mybuild = self.create_generic_build(2, ['a_second_committer@chromium.org'])
     mybuild.finished = False
     self.masters[0].builders[0].builds.append(mybuild)
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step4']})
 
     @contextlib.contextmanager
     def delfile(filename):
       yield
       os.unlink(filename)
 
     with delfile(dbfilename):
       urls = self.call_gatekeeper()
       with open(dbfilename) as f:
         new_build_db = json.load(f)
-    self.assertEquals(new_build_db, {self.masters[0].url: {'mybuilder': 1}})
+    finished_new_builds = [
+        b for b in new_build_db['masters'][self.masters[0].url]['mybuilder'] if
+        b.get('finished')]
+    self.assertEquals(finished_new_builds,
+                      [{'build': 1, 'finished': True}])
+    unfinished_new_builds = [
+        b for b in new_build_db['masters'][self.masters[0].url]['mybuilder']
+        if not b.get('finished')]
+    self.assertEquals(unfinished_new_builds,
+                      [{'build': 2}])
     self.assertNotIn(self.status_url, urls)
 
+  def testTriggeringDoesntTriggerOnSameBuild(self):
+    """Test that a section won't fire twice on a build."""
+    fd, dbfilename = tempfile.mkstemp()
+    build_db = {'build_db_version': gatekeeper_ng.BUILD_DB_VERSION,
+                'sections': {},
+                'masters': {
+                  self.masters[0].url: {
+                    'mybuilder': [],
+                  },
+                },
+               }
+    os.write(fd, json.dumps(build_db))
+    os.close(fd)
+
+    sys.argv.extend([m.url for m in self.masters])
+    sys.argv.extend(['--build-db=%s' % dbfilename,
+                     '--json', self.gatekeeper_file,
+                     '--no-email-app', '--set-status',
+                     '--password-file', self.status_secret_file])
+
+    self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
+    self.masters[0].builders[0].builds[0].finished = False
+    self.add_gatekeeper_section(self.masters[0].url,
+                                self.masters[0].builders[0].name,
+                                {'closing_steps': ['step1']})
+
+    @contextlib.contextmanager
+    def delfile(filename):
+      yield
+      os.unlink(filename)
+
+    with delfile(dbfilename):
+      urls = self.call_gatekeeper()
+      urls += self.call_gatekeeper()
+      with open(dbfilename) as f:
+        new_build_db = json.load(f)
+    print new_build_db
+    finished_new_builds = [
+        b for b in new_build_db['masters'][self.masters[0].url]['mybuilder'] if
+        b.get('finished')]
+    self.assertEquals(finished_new_builds, [])
+    unfinished_new_builds = [
+        b for b in new_build_db['masters'][self.masters[0].url]['mybuilder']
+        if not b.get('finished')]
+    self.assertEquals(unfinished_new_builds,
+                      [{'build': 1,
+                        'triggered': ['2be9f9320c2d26b09e416d615ff047'
+                                      '86abc74794bd5b669a1bb4228f884ddf50']}])
+    self.assertEquals(1, len([u for u in urls if u == self.status_url]))
+
+  def testTriggeringOneHashDoesntStopAnother(self):
+    """Test that firing on one hash doesn't prevent another hash triggering."""
+    fd, dbfilename = tempfile.mkstemp()
+    build_db = {'build_db_version': gatekeeper_ng.BUILD_DB_VERSION,
+                'sections': {},
+                'masters': {
+                    self.masters[0].url: { 'mybuilder': [{'build': 1,
+                                                          'finished': True}] }
+                }
+               }
+    os.write(fd, json.dumps(build_db))
+    os.close(fd)
+
+    sys.argv.extend([m.url for m in self.masters])
+    sys.argv.extend(['--build-db=%s' % dbfilename,
+                     '--json', self.gatekeeper_file,
+                     '--no-email-app', '--set-status',
+                     '--password-file', self.status_secret_file])
+
+    mybuild = self.create_generic_build(2, ['a_second_committer@chromium.org'])
+    mybuild.finished = False
+    self.masters[0].builders[0].builds.append(mybuild)
+    self.masters[0].builders[0].builds[1].steps[1].results = [2, None]
+    self.add_gatekeeper_section(self.masters[0].url,
+                                self.masters[0].builders[0].name,
+                                {'closing_steps': ['step1']})
+
+    @contextlib.contextmanager
+    def delfile(filename):
+      yield
+      os.unlink(filename)
+
+    with delfile(dbfilename):
+      urls = self.call_gatekeeper()
+      self.add_gatekeeper_section(self.masters[0].url,
+                                  self.masters[0].builders[0].name,
+                                  {'closing_steps': ['step2']})
+      self.masters[0].builders[0].builds[1].steps[2].results = [2, None]
+      print 'nerdup', urls
+      urls += self.call_gatekeeper()
+      print 'nerdup kwarg', urls
+      with open(dbfilename) as f:
+        new_build_db = json.load(f)
+    finished_new_builds = [
+        b for b in new_build_db['masters'][self.masters[0].url]['mybuilder'] if
+        b.get('finished')]
+    self.assertEquals(finished_new_builds,
+                      [{'build': 1, 'finished': True}])
+    unfinished_new_builds = [
+        b for b in new_build_db['masters'][self.masters[0].url]['mybuilder']
+        if not b.get('finished')]
+    self.assertEquals(unfinished_new_builds,
+                      [{'build': 2,
+                        'triggered': ['2be9f9320c2d26b09e416d615ff04786ab'
+                                      'c74794bd5b669a1bb4228f884ddf50',
+
+                                      'ac0bb2a7245af2aa43c257a3c4eda19dee'
+                                      'a4137bc1bce6a8b307047fd6149e32']}])
+    self.assertEquals(2, len([u for u in urls if u == self.status_url]))
+
   ### JSON config file tests.
 
   def testInheritFromCategory(self):
     """Check that steps in categories are inherited by builders."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_category('mycat', {'closing_steps': ['step1']})
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'categories': ['mycat']})
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testMultiCategory(self):
     """Check that steps in categories are inherited by builders."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[2].results = [2, None]
     self.add_gatekeeper_category('mycat', {'closing_steps': ['step1']})
     self.add_gatekeeper_category('mycat2', {'closing_steps': ['step2']})
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'categories': ['mycat', 'mycat2']})
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testAddonCategory(self):
     """Check that builders can add-on to categories."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_category('mycat', {'closing_steps': ['step2']})
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'categories': ['mycat'],
                                  'closing_steps': ['step1']})
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testInheritFromMaster(self):
     """Check that steps in masters are inherited by builders."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_master_config(self.masters[0].url,
                                       {'sheriff_classes': ['sheriff_android']})
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']},
                                 idx=0)
 
@@ skipping 13 matching lines @@
     self.assertEquals(mailer_data['recipients'],
                       ['a_committer@chromium.org',
                        'anothersheriff@google.com',
                        'asheriff@google.com'])
 
   def testAddonToMaster(self):
     """Check that steps in masters can be added by builders."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_master_config(self.masters[0].url,
                                       {'sheriff_classes': ['sheriff_android']})
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1'],
                                  'sheriff_classes': ['sheriff']},
                                 idx=0)
@@ skipping 21 matching lines @@
                        'anothersheriff2@google.com',
                        'anothersheriff@google.com',
                        'asheriff2@google.com',
                        'asheriff@google.com'])
 
   def testInheritCategoryFromMaster(self):
     """Check that steps can inherit categories from masters."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_category('mycat', {'closing_steps': ['step1']})
     self.add_gatekeeper_master_config(self.masters[0].url,
                                       {'categories': ['mycat']})
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {},
                                 idx=0)
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testMasterSections(self):
     """Check that master sections work correctly."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_category('mycat', {'closing_steps': ['step1']})
     self.add_gatekeeper_master_config(self.masters[0].url,
                                       {}
                                       )
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {},
                                 idx=0)
 
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'categories': ['mycat']})
 
     self.call_gatekeeper()
 
     # Check that gatekeeper indeed sent an email.
     self.assertEquals(self.url_calls[-1]['url'], self.mailer_url)
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org'])
 
   def testMasterSectionEmails(self):
     """Check that master section handles email properly."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_category('mycat', {'closing_steps': ['step1']})
     self.add_gatekeeper_master_config(self.masters[0].url,
                                       {}
                                       )
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1'],
@@ skipping 11 matching lines @@
     mailer_data = GatekeeperTest.decode_param_json(
         self.url_calls[-1]['params'])
     self.assertEquals(mailer_data['recipients'], ['a_committer@chromium.org',
                                                   'a_watcher@chromium.org'])
 
   def testEmailFilter(self):
     """Test that no email is sent if the email isn't in the domain filter."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file,
                      '--filter-domain=squirrels.net,squirrels.com'])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']})
 
     urls = self.call_gatekeeper()
     self.assertNotIn(self.mailer_url, urls)
 
   def testDisableEmailFilter(self):
     """Test that no email is sent if the email isn't in the domain filter."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--email-app-secret-file=%s' % self.email_secret_file,
                      '--disable-domain-filter',
                      '--filter-domain=squirrels.net,squirrels.com'])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']})
 
     self.call_gatekeeper()
@@ skipping 13 matching lines @@
                      '--no-email-app'])
     with self.assertRaises(ValueError):
       self.call_gatekeeper()
 
   def testSectionWillNotCloseTree(self):
     """Test that close_tree=False sections don't call to the status app."""
     sys.argv.extend([m.url for m in self.masters])
     sys.argv.extend(['--skip-build-db-update',
                      '--no-email-app', '--set-status',
                      '--json', self.gatekeeper_file,
+                     '--process-finished-builds-on-new-builder',
                      '--password-file', self.status_secret_file])
 
     self.masters[0].builders[0].builds[0].steps[1].results = [2, None]
     self.add_gatekeeper_section(self.masters[0].url,
                                 self.masters[0].builders[0].name,
                                 {'closing_steps': ['step1']})
 
     self.handle_url_str(self.status_url, 'the status')
 
     self.add_gatekeeper_master_section(self.masters[0].url, -1,
@@ skipping 16 matching lines @@
   def testCheckedInConfigIsValid(self):
     sys.argv.extend(['--verify',
                      '--json',
                      os.path.join(SCRIPT_DIR, os.pardir, 'gatekeeper.json')])
     self.call_gatekeeper()
 
 
 if __name__ == '__main__':
   with utils.print_coverage(include=[__file__]):
     unittest.main()