Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab

1 files changed, 6 insertions, 5 deletions

diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
index 5a682a1339..f81b316aa2 100755
--- a/PRESUBMIT_test.py
+++ b/PRESUBMIT_test.py
@@ -470,17 +470,17 @@ class JSONParsingTest(unittest.TestCase):
     test_data = [
       ('invalid_json_1.json',
        ['{ x }'],
-       'Expecting property name: line 1 column 2 (char 2)'),
+       'Expecting property name:'),
       ('invalid_json_2.json',
        ['// Hello world!',
         '{ "hello": "world }'],
-       'Unterminated string starting at: line 2 column 12 (char 12)'),
+       'Unterminated string starting at:'),
       ('invalid_json_3.json',
        ['{ "a": "b", "c": "d", }'],
-       'Expecting property name: line 1 column 22 (char 22)'),
+       'Expecting property name:'),
       ('invalid_json_4.json',
        ['{ "a": "b" "c": "d" }'],
-       'Expecting , delimiter: line 1 column 11 (char 11)'),
+       'Expecting , delimiter:'),
       ]
 
     input_api.files = [MockFile(filename, contents)
@@ -488,7 +488,8 @@ class JSONParsingTest(unittest.TestCase):
 
     for (filename, _, expected_error) in test_data:
       actual_error = PRESUBMIT._GetJSONParseError(input_api, filename)
-      self.assertEqual(expected_error, str(actual_error))
+      self.assertTrue(expected_error in str(actual_error),
+                      "'%s' not found in '%s'" % (expected_error, actual_error))
 
   def testNoEatComments(self):
     input_api = MockInputApi()