@@ -113,11 +113,9 @@ def optional_tests_of(self, name):
113
113
114
114
def to_unittest_testcase (self , * suites , ** kwargs ):
115
115
name = kwargs .pop ("name" , "Test" + self .name .title ())
116
- skip = kwargs .pop ("skip" , lambda test : None )
116
+ kwargs .setdefault ("skip" , lambda test : None )
117
117
methods = {
118
- test .method_name : _maybe_skip (skip (test ))(
119
- test .to_unittest_method (** kwargs ),
120
- )
118
+ test .method_name : test .to_unittest_method (** kwargs )
121
119
for suite in suites
122
120
for tests in suite
123
121
for test in tests
@@ -180,7 +178,7 @@ def method_name(self):
180
178
name = name .encode ("utf-8" )
181
179
return name
182
180
183
- def to_unittest_method (self , ** kwargs ):
181
+ def to_unittest_method (self , skip , ** kwargs ):
184
182
if self .valid :
185
183
def fn (this ):
186
184
self .validate (** kwargs )
@@ -190,7 +188,8 @@ def fn(this):
190
188
self .validate (** kwargs )
191
189
192
190
fn .__name__ = self .method_name
193
- return fn
191
+ reason = skip (self )
192
+ return unittest .skipIf (reason is not None , reason )(fn )
194
193
195
194
def validate (self , Validator = None , ** kwargs ):
196
195
resolver = jsonschema .RefResolver .from_schema (
@@ -209,7 +208,3 @@ def validate_ignoring_errors(self, **kwargs):
209
208
self .validate (** kwargs )
210
209
except jsonschema .ValidationError :
211
210
pass
212
-
213
-
214
- def _maybe_skip (reason ):
215
- return unittest .skipIf (reason is not None , reason )
0 commit comments