Merge pull request #1541 from haberman/conformancestrict
Make conformance tests more strict about the failure list.pull/1653/head
Joshua Haberman
9 years ago
commit
ed1d560023
12 changed files with 155 additions and 163 deletions
@ -1,16 +1,11 @@ |
||||
JsonInput.AnyWithValueForInteger.JsonOutput |
||||
JsonInput.AnyWithValueForJsonObject.JsonOutput |
||||
JsonInput.FieldNameInLowerCamelCase.Validator |
||||
JsonInput.FieldNameInSnakeCase.JsonOutput |
||||
JsonInput.FieldNameInSnakeCase.ProtobufOutput |
||||
JsonInput.FieldNameWithMixedCases.JsonOutput |
||||
JsonInput.FieldNameWithMixedCases.ProtobufOutput |
||||
JsonInput.FieldNameWithMixedCases.Validator |
||||
JsonInput.Int32FieldMinFloatValue.JsonOutput |
||||
JsonInput.Int32FieldMinValue.JsonOutput |
||||
JsonInput.Int64FieldMaxValueNotQuoted.JsonOutput |
||||
JsonInput.Int64FieldMaxValueNotQuoted.ProtobufOutput |
||||
JsonInput.OriginalProtoFieldName.JsonOutput |
||||
JsonInput.StringFieldSurrogatePair.JsonOutput |
||||
JsonInput.Uint64FieldMaxValueNotQuoted.JsonOutput |
||||
JsonInput.Uint64FieldMaxValueNotQuoted.ProtobufOutput |
||||
|
||||
@ -0,0 +1,73 @@ |
||||
#!/usr/bin/env python |
||||
# Protocol Buffers - Google's data interchange format |
||||
# Copyright 2008 Google Inc. All rights reserved. |
||||
# https://developers.google.com/protocol-buffers/ |
||||
# |
||||
# 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 |
||||
# copyright notice, this list of conditions and the following disclaimer |
||||
# in the documentation and/or other materials provided with the |
||||
# distribution. |
||||
# * Neither the name of Google Inc. nor the names of its |
||||
# contributors may be used to endorse or promote products derived from |
||||
# this software without specific prior written permission. |
||||
# |
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
|
||||
"""Script to update a failure list file to add/remove failures. |
||||
|
||||
This is sort of like comm(1), except it recognizes comments and ignores them. |
||||
""" |
||||
|
||||
import argparse |
||||
import fileinput |
||||
|
||||
parser = argparse.ArgumentParser( |
||||
description='Adds/removes failures from the failure list.') |
||||
parser.add_argument('filename', type=str, help='failure list file to update') |
||||
parser.add_argument('--add', dest='add_list', action='append') |
||||
parser.add_argument('--remove', dest='remove_list', action='append') |
||||
|
||||
args = parser.parse_args() |
||||
|
||||
add_set = set() |
||||
remove_set = set() |
||||
|
||||
for add_file in (args.add_list or []): |
||||
with open(add_file) as f: |
||||
for line in f: |
||||
add_set.add(line) |
||||
|
||||
for remove_file in (args.remove_list or []): |
||||
with open(remove_file) as f: |
||||
for line in f: |
||||
if line in add_set: |
||||
raise "Asked to both add and remove test: " + line |
||||
remove_set.add(line.strip()) |
||||
|
||||
add_list = sorted(add_set, reverse=True) |
||||
|
||||
existing_list = file(args.filename).read() |
||||
|
||||
with open(args.filename, "w") as f: |
||||
for line in existing_list.splitlines(True): |
||||
test = line.split("#")[0].strip() |
||||
while len(add_list) > 0 and test > add_list[-1]: |
||||
f.write(add_list.pop()) |
||||
if test not in remove_set: |
||||
f.write(line) |
||||
Loading…
Reference in new issue