Use m['approval'] instead of looking at the text for 'lgtm'.

tests/presubmit_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 presubmit_support.py and presubmit_canned_checks.py."""
 
 # pylint is too confused.
 # pylint: disable=E1101,E1103,R0201,W0212,W0403
 
@@ skipping 2011 matching lines @@
       affected_file.LocalPath().AndReturn('foo.cc')
       change.AffectedFiles(file_filter=None).AndReturn([affected_file])
 
       expected_host = 'http://localhost'
       if host_url:
         input_api.host_url = host_url
         if host_url.startswith('https'):
           expected_host = host_url
 
       owner_email = 'john@example.com'
-      messages = list('{"sender": "' + a + '","text": "lgtm"}' for
-                      a in approvers)
       if not rietveld_response:
-        rietveld_response = ('{"owner_email": "' + owner_email + '",'
-                            '"messages": [' + ','.join(messages) + ']}')
+        messages = (
+          '{"sender": "%s", "text": "I approve", "approval": true}' % a
+          for a in approvers)
+        rietveld_response = '{"owner_email": "%s", "messages": [%s]}' % (
+            owner_email, ','.join(messages))
       input_api.urllib2.urlopen(
           expected_host + '/api/1?messages=true').AndReturn(
           StringIO.StringIO(rietveld_response))
       input_api.json = presubmit.json
       fake_db.files_not_covered_by(set(['foo.cc']),
          approvers.union(set([owner_email]))).AndReturn(uncovered_files)
 
     self.mox.ReplayAll()
     output = presubmit.PresubmitOutput()
     results = presubmit_canned_checks.CheckOwners(input_api,
         presubmit.OutputApi)
     if results:
       results[0].handle(output)
     self.assertEquals(output.getvalue(), expected_output)
 
   def testCannedCheckOwners_LGTMPhrases(self):
-    def phrase_test(phrase, approvers=None, expected_output=''):
+    def phrase_test(approval, approvers=None, expected_output=''):
       if approvers is None:
         approvers = set(['ben@example.com'])
       self.AssertOwnersWorks(approvers=approvers,
-          rietveld_response='{"owner_email": "john@example.com",' +
-                            '"messages": [{"sender": "ben@example.com",' +
-                                          '"text": "' + phrase + '"}]}',
+          rietveld_response=(
+            '{"owner_email": "john@example.com",'
+            '"messages": [{"sender": "ben@example.com",'
+            '  "text": "foo", "approval": %s}]}') % approval,
           expected_output=expected_output)
 
-    phrase_test('LGTM')
-    phrase_test('\\nlgtm')
-    phrase_test('> foo\\n> bar\\nlgtm\\n')
-    phrase_test('> LGTM', approvers=set(),
+    phrase_test('true')
+    phrase_test('false', approvers=set(),
                 expected_output='Missing LGTM from someone other than '
                                 'john@example.com\n')
 
-    # TODO(dpranke): these probably should pass.
-    phrase_test('Looks Good To Me', approvers=set(),
-                expected_output='Missing LGTM from someone other than '
-                                'john@example.com\n')
-    phrase_test('looks good to me', approvers=set(),
-                expected_output='Missing LGTM from someone other than '
-                                'john@example.com\n')
-
-    # TODO(dpranke): this probably shouldn't pass.
-    phrase_test('no lgtm for you')
-
   def testCannedCheckOwners_HTTPS_HostURL(self):
     self.AssertOwnersWorks(approvers=set(['ben@example.com']),
                            host_url='https://localhost')
 
   def testCannedCheckOwners_MissingSchemeInHostURL(self):
     self.AssertOwnersWorks(approvers=set(['ben@example.com']),
                            host_url='localhost')
 
   def testCannedCheckOwners_NoIssue(self):
     self.AssertOwnersWorks(issue=None,
@@ skipping 78 matching lines @@
         whitelist=['^a$', '^b$'],
         blacklist=['a'])
     self.assertEqual(results, [])
     self.checkstdout(
         'Running %s\n' % presubmit.os.path.join('random_directory', 'b'))
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()