[test+presubmit] Remove duplicate test status file entries

tools/presubmit.py

 #!/usr/bin/env python
 #
 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 try:
   import hashlib
   md5er = hashlib.md5
 except ImportError, e:
   import md5
   md5er = md5.new
 
 
+import json
 import optparse
 import os
 from os.path import abspath, join, dirname, basename, exists
 import pickle
 import re
 import sys
 import subprocess
 import multiprocessing
 from subprocess import PIPE
 
@@ skipping 352 matching lines @@
         handle.close()
     print "Total violating files: %s" % violations
     return success
 
 
 def CheckExternalReferenceRegistration(workspace):
   code = subprocess.call(
       [sys.executable, join(workspace, "tools", "external-reference-check.py")])
   return code == 0
 
+
+def _CheckStatusFileForDuplicateKeys(filepath):
+  comma_space_bracket = re.compile(", *]")
+  lines = []
+  with open(filepath) as f:
+    for line in f.readlines():
+      # Skip all-comment lines.
+      if line.lstrip().startswith("#"): continue
+      # Strip away comments at the end of the line.
+      comment_start = line.find("#")
+      if comment_start != -1:
+        line = line[:comment_start]
+      line = line.strip()
+      # Strip away trailing commas within the line.
+      line = comma_space_bracket.sub("]", line)
+      if len(line) > 0:
+        lines.append(line)
+
+  # Strip away trailing commas at line ends. Ugh.
+  for i in range(len(lines) - 1):
+    if (lines[i].endswith(",") and len(lines[i + 1]) > 0 and
+        lines[i + 1][0] in ("}", "]")):
+      lines[i] = lines[i][:-1]
+
+  contents = "\n".join(lines)
+  # JSON wants double-quotes.
+  contents = contents.replace("'", '"')
+  # Fill in keywords (like PASS, SKIP).
+  for key in statusfile.KEYWORDS:
+    contents = re.sub(r"\b%s\b" % key, "\"%s\"" % key, contents)
+
+  status = {"success": True}
+  def check_pairs(pairs):
+    keys = {}
+    for key, value in pairs:
+      if key in keys:
+        print("%s: Error: duplicate key %s" % (filepath, key))
+        status["success"] = False
+      keys[key] = True
+
+  json.loads(contents, object_pairs_hook=check_pairs)
+  return status["success"]
+
 def CheckStatusFiles(workspace):
+  success = True
   suite_paths = utils.GetSuitePaths(join(workspace, "test"))
   for root in suite_paths:
     suite_path = join(workspace, "test", root)
     status_file_path = join(suite_path, root + ".status")
     suite = testsuite.TestSuite.LoadTestSuite(suite_path)
     if suite and exists(status_file_path):
       if not statusfile.PresubmitCheck(status_file_path):

[Michael Achenbach, 2015/11/27 14:24:20]

suggestion: Maybe rewrite this with:

success &= Check1()
success &= Check2()

[Jakob Kummerow, 2015/11/27 14:43:26]

Done.

-        return False
-  return True
+        success = False
+      if not _CheckStatusFileForDuplicateKeys(status_file_path):
+        success = False
+  return success
 
 def CheckAuthorizedAuthor(input_api, output_api):
   """For non-googler/chromites committers, verify the author's email address is
   in AUTHORS.
   """
   # TODO(maruel): Add it to input_api?
   import fnmatch
 
   author = input_api.change.author_email
   if not author:
@@ skipping 37 matching lines @@
   success = CheckExternalReferenceRegistration(workspace) and success
   success = CheckStatusFiles(workspace) and success
   if success:
     return 0
   else:
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(Main())