Can't pass through presubmit with policy_templates.json

13 views
Skip to first unread message

igo...@chromium.org

unread,
Aug 14, 2017, 10:40:17 AM8/14/17
to Chromium-dev
Have there been any recent changes in presubmit scripts?

I'm trying to commit the policy_templates.json file and get an error. Following is the changes:
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -9714,11 +9714,12 @@
           'caption': '''Allow data migration''',
         },
       ],
-      'supported_on': ['chrome_os:60-'],
+      'supported_on': ['chrome_os:60-60'],
       'device_only': True,
       'features': {
         'dynamic_refresh': True,
       },
+      'deprecated': True,
       'example_value': 1,

And following is the error:
Running presubmit upload checks ...
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/browser/chromeos/arc/arc_session_manager.cc
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/browser/chromeos/arc/arc_util.cc
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/browser/chromeos/arc/arc_util.h
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/browser/chromeos/arc/arc_util_unittest.cc
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/browser/chromeos/login/existing_user_controller.cc
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/browser/chromeos/login/screens/user_selection_screen.cc
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/browser/policy/configuration_policy_handler_list_factory.cc
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/common/pref_names.cc
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/common/pref_names.h
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/browser/chromeos/arc/arc_session_manager.cc
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/browser/chromeos/arc/arc_util.cc
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/browser/chromeos/arc/arc_util.h
Done processing /usr/local/google/home/igorcov/chromium/src/chrome/browser/chromeos/arc/arc_util_unittest.cc
Finished checking /usr/local/google/home/igorcov/chromium/src/components/policy/resources/policy_templates.json. 0 errors, 0 warnings.
Traceback (most recent call last):
  File "/usr/local/google/home/igorcov/depot_tools/git_cl.py", line 6094, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/usr/local/google/home/igorcov/depot_tools/git_cl.py", line 6076, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/usr/local/google/home/igorcov/depot_tools/subcommand.py", line 252, in execute
    return command(parser, args[1:])
  File "/usr/local/google/home/igorcov/depot_tools/git_cl.py", line 4943, in CMDupload
    return cl.CMDUpload(options, args, orig_args)
  File "/usr/local/google/home/igorcov/depot_tools/git_cl.py", line 1641, in CMDUpload
    change=change)
  File "/usr/local/google/home/igorcov/depot_tools/git_cl.py", line 1573, in RunHook
    gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
  File "/usr/local/google/home/igorcov/depot_tools/presubmit_support.py", line 1359, in DoPresubmitChecks
    results += executer.ExecPresubmitScript(presubmit_script, filename)
  File "/usr/local/google/home/igorcov/depot_tools/presubmit_support.py", line 1269, in ExecPresubmitScript
    result = eval(function_name + '(*__args)', context)
  File "<string>", line 1, in <module>
  File "<string>", line 124, in CheckChangeOnUpload
  File "<string>", line 117, in _CommonChecks
  File "<string>", line 54, in _CheckPolicyTestCases
  File "/usr/lib/python2.7/json/__init__.py", line 290, in load
    **kw)
  File "/usr/lib/python2.7/json/__init__.py", line 338, in loads
    return _default_decoder.decode(s)
  File "/usr/lib/python2.7/json/decoder.py", line 366, in decode
    obj, end = self.raw_decode(s, idx=_w(s, 0).end())
  File "/usr/lib/python2.7/json/decoder.py", line 382, in raw_decode
    obj, end = self.scan_once(s, idx)
ValueError: Expecting , delimiter: line 2798 column 5 (char 84437)

I also tried to undo the changes, save the file and run the presubmit_support.py locally. Got the same error.
Reply all
Reply to author
Forward
0 new messages