Skip to content

Commit bdee92d

Browse files
committed
Cope with the suite permuting of ECMA format tests.
Refs: json-schema-org/JSON-Schema-Test-Suite#751
1 parent 2f299b9 commit bdee92d

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

jsonschema/tests/test_jsonschema_test_suite.py

+15-4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ def skipper(test):
2626
return skipper
2727

2828

29+
def ecmascript_regex(test):
30+
if test.subject == "ecmascript-regex":
31+
return "ECMA regex support will be added in #1142."
32+
33+
2934
def missing_format(Validator):
3035
def missing_format(test): # pragma: no cover
3136
schema = test.schema
@@ -119,7 +124,8 @@ def leap_second(test):
119124
Validator=jsonschema.Draft3Validator,
120125
format_checker=jsonschema.Draft3Validator.FORMAT_CHECKER,
121126
skip=lambda test: (
122-
missing_format(jsonschema.Draft3Validator)(test)
127+
ecmascript_regex(test)
128+
or missing_format(jsonschema.Draft3Validator)(test)
123129
or complex_email_validation(test)
124130
),
125131
)
@@ -136,7 +142,8 @@ def leap_second(test):
136142
Validator=jsonschema.Draft4Validator,
137143
format_checker=jsonschema.Draft4Validator.FORMAT_CHECKER,
138144
skip=lambda test: (
139-
leap_second(test)
145+
ecmascript_regex(test)
146+
or leap_second(test)
140147
or missing_format(jsonschema.Draft4Validator)(test)
141148
or complex_email_validation(test)
142149
),
@@ -153,7 +160,8 @@ def leap_second(test):
153160
Validator=jsonschema.Draft6Validator,
154161
format_checker=jsonschema.Draft6Validator.FORMAT_CHECKER,
155162
skip=lambda test: (
156-
leap_second(test)
163+
ecmascript_regex(test)
164+
or leap_second(test)
157165
or missing_format(jsonschema.Draft6Validator)(test)
158166
or complex_email_validation(test)
159167
),
@@ -172,7 +180,8 @@ def leap_second(test):
172180
Validator=jsonschema.Draft7Validator,
173181
format_checker=jsonschema.Draft7Validator.FORMAT_CHECKER,
174182
skip=lambda test: (
175-
leap_second(test)
183+
ecmascript_regex(test)
184+
or leap_second(test)
176185
or missing_format(jsonschema.Draft7Validator)(test)
177186
or complex_email_validation(test)
178187
),
@@ -208,6 +217,7 @@ def leap_second(test):
208217
format_checker=jsonschema.Draft201909Validator.FORMAT_CHECKER,
209218
skip=lambda test: (
210219
complex_email_validation(test)
220+
or ecmascript_regex(test)
211221
or leap_second(test)
212222
or missing_format(jsonschema.Draft201909Validator)(test)
213223
or complex_email_validation(test)
@@ -244,6 +254,7 @@ def leap_second(test):
244254
format_checker=jsonschema.Draft202012Validator.FORMAT_CHECKER,
245255
skip=lambda test: (
246256
complex_email_validation(test)
257+
or ecmascript_regex(test)
247258
or leap_second(test)
248259
or missing_format(jsonschema.Draft202012Validator)(test)
249260
or complex_email_validation(test)

0 commit comments

Comments
 (0)