schemathesis 3.39.11__tar.gz → 3.39.12__tar.gz

{schemathesis-3.39.11 → schemathesis-3.39.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: schemathesis
-Version: 3.39.11
+Version: 3.39.12
 Summary: Property-based testing framework for Open API and GraphQL based apps
 Project-URL: Documentation, https://schemathesis.readthedocs.io/en/stable/
 Project-URL: Changelog, https://schemathesis.readthedocs.io/en/stable/changelog.html

{schemathesis-3.39.11 → schemathesis-3.39.12}/docs/changelog.rst

@@ -1,9 +1,22 @@
 Changelog
 =========
 
-:version:`Unreleased <v3.39.11...HEAD>` - TBD
+:version:`Unreleased <v3.39.12...HEAD>` - TBD
 ---------------------------------------------
 
+.. _v3.39.12:
+
+:version:`3.39.12 <v3.39.11...v3.39.12>` - 2025-03-05
+-----------------------------------------------------
+
+**Added**
+
+- `--experimental-coverage-unspecified-methods` CLI option that accept a comma separated list of HTTP methods to use when generating test cases with methods not specified in the API during the **coverage** phase.
+
+**Fixed**
+
+- Incorrect quantifiers merging for patterns involving single-element set of characters like ``[+]``.
+
 .. _v3.39.11:
 
 :version:`3.39.11 <v3.39.10...v3.39.11>` - 2025-02-23

{schemathesis-3.39.11 → schemathesis-3.39.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "schemathesis"
-version = "3.39.11"
+version = "3.39.12"
 description = "Property-based testing framework for Open API and GraphQL based apps"
 keywords = ["pytest", "hypothesis", "openapi", "graphql", "testing"]
 authors = [{ name = "Dmitry Dygalo", email = "dmitry@dygalo.dev" }]

{schemathesis-3.39.11 → schemathesis-3.39.12}/src/schemathesis/_hypothesis.py

@@ -114,8 +114,14 @@ def create_test(
                 wrapped_test, operation, hook_dispatcher=hook_dispatcher, as_strategy_kwargs=as_strategy_kwargs
             )
             if COVERAGE_PHASE.is_enabled:
+                unexpected_methods = generation_config.unexpected_methods if generation_config else None
                 wrapped_test = add_coverage(
-                    wrapped_test, operation, data_generation_methods, auth_storage, as_strategy_kwargs
+                    wrapped_test,
+                    operation,
+                    data_generation_methods,
+                    auth_storage,
+                    as_strategy_kwargs,
+                    unexpected_methods,
                 )
     return wrapped_test
 
@@ -225,6 +231,7 @@ def add_coverage(
     data_generation_methods: list[DataGenerationMethod],
     auth_storage: AuthStorage | None,
     as_strategy_kwargs: dict[str, Any],
+    unexpected_methods: set[str] | None = None,
 ) -> Callable:
     from schemathesis.specs.openapi.constants import LOCATION_TO_CONTAINER
 
@@ -237,7 +244,7 @@ def add_coverage(
         for container in LOCATION_TO_CONTAINER.values()
         if container in as_strategy_kwargs
     }
-    for case in _iter_coverage_cases(operation, data_generation_methods):
+    for case in _iter_coverage_cases(operation, data_generation_methods, unexpected_methods):
         if case.media_type and get_first_matching_media_type(case.media_type) is None:
             continue
         adjust_urlencoded_payload(case)
@@ -363,7 +370,9 @@ def _stringify_value(val: Any, container_name: str) -> Any:
 
 
 def _iter_coverage_cases(
-    operation: APIOperation, data_generation_methods: list[DataGenerationMethod]
+    operation: APIOperation,
+    data_generation_methods: list[DataGenerationMethod],
+    unexpected_methods: set[str] | None = None,
 ) -> Generator[Case, None, None]:
     from .specs.openapi.constants import LOCATION_TO_CONTAINER
     from .specs.openapi.examples import find_in_responses, find_matching_in_responses
@@ -373,6 +382,8 @@ def _iter_coverage_cases(
     serializers = get_serializers_for_operation(operation)
     template = Template(serializers)
     responses = find_in_responses(operation)
+    # NOTE: The HEAD method is excluded
+    unexpected_methods = unexpected_methods or {"get", "put", "post", "delete", "options", "patch", "trace"}
     for parameter in operation.iter_parameters():
         location = parameter.location
         name = parameter.name
@@ -448,8 +459,7 @@ def _iter_coverage_cases(
             yield case
     if DataGenerationMethod.negative in data_generation_methods:
         # Generate HTTP methods that are not specified in the spec
-        # NOTE: The HEAD method is excluded
-        methods = {"get", "put", "post", "delete", "options", "patch", "trace"} - set(operation.schema[operation.path])
+        methods = unexpected_methods - set(operation.schema[operation.path])
         for method in sorted(methods):
             data = template.unmodified()
             case = operation.make_case(**data.kwargs)

{schemathesis-3.39.11 → schemathesis-3.39.12}/src/schemathesis/cli/__init__.py

@@ -9,7 +9,7 @@ from collections import defaultdict
 from dataclasses import dataclass
 from enum import Enum
 from queue import Queue
-from typing import TYPE_CHECKING, Any, Callable, Generator, Iterable, Literal, NoReturn, Sequence, Type, cast
+from typing import TYPE_CHECKING, Any, Callable, Generator, Iterable, Literal, NoReturn, Sequence, cast
 from urllib.parse import urlparse
 
 import click
@@ -27,6 +27,7 @@ from ..constants import (
     DEFAULT_STATEFUL_RECURSION_LIMIT,
     EXTENSIONS_DOCUMENTATION_URL,
     HOOKS_MODULE_ENV_VAR,
+    HTTP_METHODS,
     HYPOTHESIS_IN_MEMORY_DATABASE_IDENTIFIER,
     ISSUE_TRACKER_URL,
     WAIT_FOR_SCHEMA_ENV_VAR,
@@ -323,6 +324,16 @@ REPORT_TO_SERVICE = ReportToService()
     multiple=True,
     metavar="",
 )
+@grouped_option(
+    "--experimental-coverage-unexpected-methods",
+    "coverage_unexpected_methods",
+    help="HTTP methods to use when generating test cases with methods not specified in the API during the coverage phase.",
+    type=CsvChoice(sorted(HTTP_METHODS), case_sensitive=False),
+    callback=callbacks.convert_http_methods,
+    metavar="",
+    default=None,
+    envvar="SCHEMATHESIS_EXPERIMENTAL_COVERAGE_UNEXPECTED_METHODS",
+)
 @grouped_option(
     "--experimental-no-failfast",
     "no_failfast",
@@ -874,6 +885,7 @@ def run(
     set_path: dict[str, str],
     experiments: list,
     no_failfast: bool,
+    coverage_unexpected_methods: set[str] | None,
     missing_required_header_allowed_statuses: list[str],
     positive_data_acceptance_allowed_statuses: list[str],
     negative_data_rejection_allowed_statuses: list[str],
@@ -1000,6 +1012,7 @@ def run(
         graphql_allow_null=generation_graphql_allow_null,
         codec=generation_codec,
         with_security_parameters=generation_with_security_parameters,
+        unexpected_methods=coverage_unexpected_methods,
     )
 
     report: ReportToService | click.utils.LazyFile | None

{schemathesis-3.39.11 → schemathesis-3.39.12}/src/schemathesis/cli/callbacks.py

@@ -344,6 +344,14 @@ def convert_checks(ctx: click.core.Context, param: click.core.Parameter, value:
     return reduce(operator.iadd, value, [])
 
 
+def convert_http_methods(
+    ctx: click.core.Context, param: click.core.Parameter, value: list[str] | None
+) -> set[str] | None:
+    if value is None:
+        return value
+    return {item.lower() for item in value}
+
+
 def convert_status_codes(
     ctx: click.core.Context, param: click.core.Parameter, value: list[str] | None
 ) -> list[str] | None:

{schemathesis-3.39.11 → schemathesis-3.39.12}/src/schemathesis/cli/options.py

@@ -26,7 +26,12 @@ class CustomHelpMessageChoice(click.Choice):
 class BaseCsvChoice(click.Choice):
     def parse_value(self, value: str) -> tuple[list[str], set[str]]:
         selected = [item for item in value.split(",") if item]
-        invalid_options = set(selected) - set(self.choices)
+        if not self.case_sensitive:
+            invalid_options = {
+                item for item in selected if item.upper() not in {choice.upper() for choice in self.choices}
+            }
+        else:
+            invalid_options = set(selected) - set(self.choices)
         return selected, invalid_options
 
     def fail_on_invalid_options(self, invalid_options: set[str], selected: list[str]) -> NoReturn:

{schemathesis-3.39.11 → schemathesis-3.39.12}/src/schemathesis/generation/__init__.py

@@ -50,3 +50,4 @@ class GenerationConfig:
     with_security_parameters: bool = True
     # Header generation configuration
     headers: HeaderConfig = field(default_factory=HeaderConfig)
+    unexpected_methods: set[str] | None = None

{schemathesis-3.39.11 → schemathesis-3.39.12}/src/schemathesis/specs/openapi/patterns.py

@@ -124,6 +124,21 @@ def _handle_anchored_pattern(parsed: list, pattern: str, min_length: int | None,
 
     for op, value in pattern_parts:
         if op == LITERAL:
+            # Check if the literal comes from a bracketed expression,
+            # e.g. Python regex parses "[+]" as a single LITERAL token.
+            if pattern[current_position] == "[":
+                # Find the matching closing bracket.
+                end_idx = current_position + 1
+                while end_idx < len(pattern):
+                    # Check for an unescaped closing bracket.
+                    if pattern[end_idx] == "]" and (end_idx == current_position + 1 or pattern[end_idx - 1] != "\\"):
+                        end_idx += 1
+                        break
+                    end_idx += 1
+                # Append the entire character set.
+                result += pattern[current_position:end_idx]
+                current_position = end_idx
+                continue
             if pattern[current_position] == "\\":
                 # Escaped value
                 current_position += 2

{schemathesis-3.39.11 → schemathesis-3.39.12}/test/cli/__snapshots__/test_commands/test_run_output[args24].raw

@@ -24,6 +24,13 @@ Experimental options:
                                             schema-analysis, stateful-test-
                                             runner, stateful-only, coverage-
                                             phase, positive_data_acceptance]
+  --experimental-coverage-unexpected-methods 
+                                            HTTP methods to use when generating
+                                            test cases with methods not
+                                            specified in the API during the
+                                            coverage phase. [possible values:
+                                            delete, get, head, options, patch,
+                                            post, put, trace]
   --experimental-no-failfast                Continue testing an API operation
                                             after a failure is found
   --experimental-missing-required-header-allowed-statuses 

{schemathesis-3.39.11 → schemathesis-3.39.12}/test/coverage/test_phase.py

@@ -9,6 +9,7 @@ from schemathesis import experimental
 from schemathesis._hypothesis import create_test
 from schemathesis.constants import NOT_SET
 from schemathesis.experimental import COVERAGE_PHASE
+from schemathesis.generation import GenerationConfig
 from schemathesis.generation._methods import DataGenerationMethod
 from schemathesis.models import TestPhase
 from schemathesis.specs.openapi.constants import LOCATION_TO_CONTAINER
@@ -1367,6 +1368,20 @@ def test_unspecified_http_methods(ctx, cli, openapi3_base_url, snapshot_cli):
 
     assert methods == {"PATCH", "TRACE", "DELETE", "OPTIONS", "PUT"}
 
+    methods = set()
+
+    test_func = create_test(
+        operation=operation,
+        test=test,
+        generation_config=GenerationConfig(unexpected_methods={"DELETE", "PUT"}),
+        data_generation_methods=[DataGenerationMethod.negative],
+        settings=settings(phases=[Phase.explicit]),
+    )
+
+    test_func()
+
+    assert methods == {"DELETE", "PUT"}
+
     module = ctx.write_pymodule(
         """
 import schemathesis

{schemathesis-3.39.11 → schemathesis-3.39.12}/test/specs/openapi/test_patterns.py

@@ -103,6 +103,8 @@ SKIP_BEFORE_PY11 = pytest.mark.skipif(
         (r"^abcd$", 50, 50, r"^abcd$"),
         # Edge cases
         ("^[a-z]*-[0-9]*$", 3, 3, "^([a-z]){0}-([0-9]){2}$"),
+        (r"^[+][\s0-9()-]+$", 1, 20, r"^[+]([\s0-9()-]){1,19}$"),
+        (r"^[\+][\s0-9()-]+$", 1, 20, r"^[\+]([\s0-9()-]){1,19}$"),
         # Multiple fixed parts
         ("^abc[0-9]{1,3}def[a-z]{2,5}ghi$", 12, 12, "^abc([0-9]){1}def([a-z]){2}ghi$"),
         ("^(((?:DB|BR)[-a-zA-Z0-9_]+),?){1,}$", None, 6000, "^(((?:DB|BR)[-a-zA-Z0-9_]+),?){1,6000}$"),