Merge pull request #249 from python-openapi/fix/discriminator-handing-for-non-object-instances

Discriminator handling for non-object instances

Author: p1c2u

openapi_schema_validator/_keywords.py

@@ -21,6 +21,13 @@ def handle_discriminator(
     """
     discriminator = schema["discriminator"]
     prop_name = discriminator["propertyName"]
+
+    if not validator.is_type(instance, "object"):
+        yield ValidationError(
+            f"{instance!r} is not of type 'object'", context=[]
+        )
+        return
+
     prop_value = instance.get(prop_name)
     if not prop_value:
         # instance is missing $propertyName

tests/integration/test_validators.py

@@ -450,6 +450,13 @@ def test_oneof_discriminator(self, validator_class, schema_type):
         validator = validator_class(
             schema, format_checker=oas30_format_checker
         )
+
+        with pytest.raises(
+            ValidationError,
+            match="is not of type 'object'",
+        ):
+            validator.validate("not-an-object")
+
         with pytest.raises(
             ValidationError, match="does not contain discriminating property"
         ):