OLD | NEW |
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 def _GetJSONParseError(input_api, contents): | 5 def _GetJSONParseError(input_api, filename): |
6 try: | 6 try: |
| 7 contents = input_api.ReadFile(filename) |
7 json_comment_eater = input_api.os_path.join( | 8 json_comment_eater = input_api.os_path.join( |
8 input_api.PresubmitLocalPath(), | 9 input_api.PresubmitLocalPath(), |
9 '..', '..', '..', '..', 'tools', | 10 '..', '..', '..', '..', 'tools', |
10 'json_comment_eater', 'json_comment_eater.py') | 11 'json_comment_eater', 'json_comment_eater.py') |
11 process = input_api.subprocess.Popen( | 12 process = input_api.subprocess.Popen( |
12 [input_api.python_executable, json_comment_eater], | 13 [input_api.python_executable, json_comment_eater], |
13 stdin=input_api.subprocess.PIPE, | 14 stdin=input_api.subprocess.PIPE, |
14 stdout=input_api.subprocess.PIPE) | 15 stdout=input_api.subprocess.PIPE, |
| 16 universal_newlines=True) |
15 (nommed, _) = process.communicate(input=contents) | 17 (nommed, _) = process.communicate(input=contents) |
16 input_api.json.loads(nommed) | 18 input_api.json.loads(nommed) |
17 except ValueError as e: | 19 except ValueError as e: |
18 return e | 20 return e |
19 return None | 21 return None |
20 | 22 |
21 | 23 |
| 24 def _GetIDLParseError(input_api, filename): |
| 25 idl_schema = input_api.os_path.join( |
| 26 input_api.PresubmitLocalPath(), |
| 27 '..', '..', '..', '..', 'tools', |
| 28 'json_schema_compiler', 'idl_schema.py') |
| 29 process = input_api.subprocess.Popen( |
| 30 [input_api.python_executable, idl_schema, filename], |
| 31 stdout=input_api.subprocess.PIPE, |
| 32 stderr=input_api.subprocess.PIPE, |
| 33 universal_newlines=True) |
| 34 (_, error) = process.communicate() |
| 35 return error or None |
| 36 |
| 37 |
22 def _GetParseErrors(input_api, output_api): | 38 def _GetParseErrors(input_api, output_api): |
23 # Run unit tests. | 39 # Run unit tests. |
24 results = [] | 40 results = [] |
25 if input_api.AffectedFiles( | 41 if input_api.AffectedFiles( |
26 file_filter=lambda f: 'PRESUBMIT' in f.LocalPath()): | 42 file_filter=lambda f: 'PRESUBMIT' in f.LocalPath()): |
27 results = input_api.canned_checks.RunUnitTestsInDirectory( | 43 results = input_api.canned_checks.RunUnitTestsInDirectory( |
28 input_api, output_api, '.', whitelist=[r'^PRESUBMIT_test\.py$']) | 44 input_api, output_api, '.', whitelist=[r'^PRESUBMIT_test\.py$']) |
29 | 45 |
| 46 actions = { |
| 47 '.idl': _GetIDLParseError, |
| 48 '.json': _GetJSONParseError, |
| 49 } |
| 50 |
| 51 def get_action(affected_file): |
| 52 filename = affected_file.LocalPath() |
| 53 return actions.get(input_api.os_path.splitext(filename)[1]) |
| 54 |
30 for affected_file in input_api.AffectedFiles( | 55 for affected_file in input_api.AffectedFiles( |
31 file_filter=lambda f: f.LocalPath().endswith('.json'), | 56 file_filter= |
| 57 lambda f: "test_presubmit" not in f.LocalPath() and get_action(f), |
32 include_deletes=False): | 58 include_deletes=False): |
33 filename = affected_file.AbsoluteLocalPath() | 59 parse_error = get_action(affected_file)(input_api, |
34 contents = input_api.ReadFile(filename) | 60 affected_file.AbsoluteLocalPath()) |
35 parse_error = _GetJSONParseError(input_api, contents) | |
36 if parse_error: | 61 if parse_error: |
37 results.append(output_api.PresubmitError( | 62 results.append(output_api.PresubmitError('%s could not be parsed: %s' % |
38 'Features file %s could not be parsed: %s' % | |
39 (affected_file.LocalPath(), parse_error))) | 63 (affected_file.LocalPath(), parse_error))) |
40 # TODO(yoz): Also ensure IDL files are parseable. | |
41 return results | 64 return results |
42 | 65 |
43 | 66 |
44 def CheckChangeOnUpload(input_api, output_api): | 67 def CheckChangeOnUpload(input_api, output_api): |
45 return _GetParseErrors(input_api, output_api) | 68 return _GetParseErrors(input_api, output_api) |
46 | 69 |
47 | 70 |
48 def CheckChangeOnCommit(input_api, output_api): | 71 def CheckChangeOnCommit(input_api, output_api): |
49 return _GetParseErrors(input_api, output_api) | 72 return _GetParseErrors(input_api, output_api) |
OLD | NEW |