Add ability to specify email subject for gatekeeper_ng.

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 526 matching lines @@
     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,
+                     '--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,
                      '--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)
 
     self.call_gatekeeper()
 
     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'])
 
     build_url = self.masters[0].url + '/builders/%s/builds/%d' % (
@@ skipping 20 matching lines @@
     self.assertEquals(mailer_data['result'], 3)
     self.assertEquals(mailer_data['blamelist'], ['a_committer@chromium.org'])
     self.assertEquals(mailer_data['changes'],
         self.masters[0].builders[0].builds[0].sourcestamp['changes'])
     self.assertEquals(mailer_data['waterfall_url'], unicode(
         self.masters[0].url + '/waterfall'))
 
     self.assertEquals(mailer_data['build_url'], unicode(build_url))
     self.assertEquals(mailer_data['project_name'], unicode('Chromium FYI'))
     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 }}
     os.write(fd, json.dumps(build_db))
     os.close(fd)
@@ skipping 814 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()