Skip to content

Commit f5197e0

Browse files
committed
Fix the output check to ignore output-schema.json.
It doesn't contain tests, so it's indeed not valid under the output schema.
1 parent a8b2805 commit f5197e0

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

bin/jsonschema_suite

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ class SanityTests(unittest.TestCase):
9999
assert cls.test_files, "Didn't find the test files!"
100100
print(f"Found {len(cls.test_files)} test files")
101101

102-
cls.output_test_files = list(collect(OUTPUT_ROOT_DIR))
102+
cls.output_test_files = [
103+
each for each in collect(OUTPUT_ROOT_DIR)
104+
if each.name != "output-schema.json"
105+
]
103106
assert cls.output_test_files, "Didn't find the output test files!"
104107
print(f"Found {len(cls.output_test_files)} output test files")
105108

@@ -234,19 +237,22 @@ class SanityTests(unittest.TestCase):
234237
"""
235238
All test files are valid under test-schema.json.
236239
"""
237-
Validator = jsonschema.validators.validator_for(TESTSUITE_SCHEMA)
238-
validator = Validator(TESTSUITE_SCHEMA)
240+
Validator = jsonschema.validators.validator_for(TEST_SCHEMA)
241+
validator = Validator(TEST_SCHEMA)
239242
for path, cases in files(self.test_files):
240243
with self.subTest(path=path):
241244
try:
242245
validator.validate(cases)
243246
except jsonschema.ValidationError as error:
244247
self.fail(str(error))
248+
249+
@unittest.skipIf(jsonschema is None, "Validation library not present!")
250+
def test_output_suites_are_valid(self):
245251
"""
246252
All output test files are valid under output-test-schema.json.
247253
"""
248-
Validator = jsonschema.validators.validator_for(OUTPUTTESTSUITE_SCHEMA)
249-
validator = Validator(OUTPUTTESTSUITE_SCHEMA)
254+
Validator = jsonschema.validators.validator_for(OUTPUT_TEST_SCHEMA)
255+
validator = Validator(OUTPUT_TEST_SCHEMA)
250256
for path, cases in files(self.output_test_files):
251257
with self.subTest(path=path):
252258
try:

0 commit comments

Comments
 (0)