wrap jsonschema exceptions with OpenAPIValidationError

Author: Daniel Grossmann-Kavanagh

openapi_spec_validator/validators.py

@@ -2,10 +2,11 @@
 import string
 
 from jsonschema.validators import RefResolver
-from six import iteritems
+from six import iteritems, raise_from
 
 from openapi_spec_validator.exceptions import (
     ParameterDuplicateError, ExtraParametersError, UnresolvableParameterError,
+    OpenAPIValidationError
 )
 from openapi_spec_validator.factories import Draft4ExtendedValidatorFactory
 from openapi_spec_validator.managers import ResolverManager
@@ -41,7 +42,7 @@ def __init__(self, validator_factory, resolver_handlers):
 
     def validate(self, spec, spec_url=''):
         for err in self.iter_errors(spec, spec_url=spec_url):
-            raise err
+            raise_from(OpenAPIValidationError(repr(err)), err)
 
     def iter_errors(self, spec, spec_url=''):
         spec_resolver = self._get_resolver(spec_url, spec)

tests/integration/test_shortcuts.py

@@ -1,9 +1,8 @@
 import pytest
 
-from jsonschema.exceptions import ValidationError
-
 from openapi_spec_validator import validate_spec, validate_spec_url
 from openapi_spec_validator import validate_v2_spec, validate_v2_spec_url
+from openapi_spec_validator.exceptions import OpenAPIValidationError
 
 
 class BaseTestValidValidteV2Spec:
@@ -15,7 +14,7 @@ def test_valid(self, spec):
 class BaseTestFaliedValidateV2Spec:
 
     def test_failed(self, spec):
-        with pytest.raises(ValidationError):
+        with pytest.raises(OpenAPIValidationError):
             validate_v2_spec(spec)
 
 
@@ -28,7 +27,7 @@ def test_valid(self, spec):
 class BaseTestFaliedValidateSpec:
 
     def test_failed(self, spec):
-        with pytest.raises(ValidationError):
+        with pytest.raises(OpenAPIValidationError):
             validate_spec(spec)
 
 
@@ -41,7 +40,7 @@ def test_valid(self, spec_url):
 class BaseTestFaliedValidateV2SpecUrl:
 
     def test_failed(self, spec_url):
-        with pytest.raises(ValidationError):
+        with pytest.raises(OpenAPIValidationError):
             validate_v2_spec_url(spec_url)
 
 
@@ -54,7 +53,7 @@ def test_valid(self, spec_url):
 class BaseTestFaliedValidateSpecUrl:
 
     def test_failed(self, spec_url):
-        with pytest.raises(ValidationError):
+        with pytest.raises(OpenAPIValidationError):
             validate_spec_url(spec_url)
 
 

tests/integration/test_validate.py

@@ -1,6 +1,6 @@
 import pytest
 
-from jsonschema.exceptions import ValidationError
+from openapi_spec_validator.exceptions import OpenAPIValidationError
 
 
 class BaseTestValidOpeAPIv3Validator(object):
@@ -20,7 +20,7 @@ def spec_url(self):
         return ''
 
     def test_failed(self, validator, spec, spec_url):
-        with pytest.raises(ValidationError):
+        with pytest.raises(OpenAPIValidationError):
             validator.validate(spec, spec_url=spec_url)