schemathesis 3.26.0__tar.gz → 3.26.1__tar.gz

{schemathesis-3.26.0 → schemathesis-3.26.1}/.github/workflows/build.yml

@@ -83,6 +83,6 @@ jobs:
         run: python -m tox
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4.1.0
+        uses: codecov/codecov-action@v4.1.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

{schemathesis-3.26.0 → schemathesis-3.26.1}/.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.24.7
+        uses: github/codeql-action/init@v3.24.9
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -49,7 +49,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3.24.7
+        uses: github/codeql-action/autobuild@v3.24.9
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -63,4 +63,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.24.7
+        uses: github/codeql-action/analyze@v3.24.9

{schemathesis-3.26.0 → schemathesis-3.26.1}/.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
       - id: yamllint
 
   - repo: https://github.com/codingjoe/relint
-    rev: 3.1.0
+    rev: 3.1.1
     hooks:
       - id: relint
 
@@ -38,12 +38,12 @@ repos:
         additional_dependencies: [types-click, types-requests, types-PyYAML]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.3
+    rev: v0.3.4
     hooks:
       - id: ruff-format
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.3
+    rev: v0.3.4
     hooks:
       - id: ruff
 

{schemathesis-3.26.0 → schemathesis-3.26.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: schemathesis
-Version: 3.26.0
+Version: 3.26.1
 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.26.0 → schemathesis-3.26.1}/docs/changelog.rst

@@ -1,9 +1,22 @@
 Changelog
 =========
 
-:version:`Unreleased <v3.26.0...HEAD>` - TBD
+:version:`Unreleased <v3.26.1...HEAD>` - TBD
 --------------------------------------------
 
+.. _v3.26.1:
+
+:version:`3.26.1 <v3.26.0...v3.26.1>` - 2024-04-04
+--------------------------------------------------
+
+**Added**
+
+- Store time needed to generate each test case.
+
+**Fixed**
+
+- ``InvalidArgument`` when using ``from_pytest_fixture`` with parametrized pytest fixtures and Hypothesis settings. :issue:`2115`
+
 .. _v3.26.0:
 
 :version:`3.26.0 <v3.25.6...v3.26.0>` - 2024-03-21

{schemathesis-3.26.0 → schemathesis-3.26.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "schemathesis"
-version = "3.26.0"
+version = "3.26.1"
 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.26.0 → schemathesis-3.26.1}/src/schemathesis/_hypothesis.py

@@ -77,7 +77,16 @@ def create_test(
             wrapped_test.hypothesis.inner_test = make_async_test(test)  # type: ignore
     setup_default_deadline(wrapped_test)
     if settings is not None:
-        wrapped_test = settings(wrapped_test)
+        existing_settings = _get_hypothesis_settings(wrapped_test)
+        if existing_settings is not None:
+            # Merge the user-provided settings with the current ones
+            default = hypothesis.settings.default
+            wrapped_test._hypothesis_internal_use_settings = hypothesis.settings(
+                wrapped_test._hypothesis_internal_use_settings,
+                **{item: value for item, value in settings.__dict__.items() if value != getattr(default, item)},
+            )
+        else:
+            wrapped_test = settings(wrapped_test)
     existing_settings = _get_hypothesis_settings(wrapped_test)
     if existing_settings is not None:
         existing_settings = remove_explain_phase(existing_settings)

{schemathesis-3.26.0 → schemathesis-3.26.1}/src/schemathesis/models.py

@@ -125,6 +125,8 @@ class Case:
     """A single test case parameters."""
 
     operation: APIOperation
+    # Time spent on generation of this test case
+    generation_time: float
     # Unique test case identifier
     id: str = field(default_factory=generate_random_case_id, compare=False)
     path_parameters: PathParameters | None = None
@@ -579,6 +581,7 @@ class Case:
             cookies=fast_deepcopy(self.cookies),
             query=fast_deepcopy(self.query),
             body=fast_deepcopy(self.body),
+            generation_time=self.generation_time,
         )
 
 

{schemathesis-3.26.0 → schemathesis-3.26.1}/src/schemathesis/runner/serialization.py

@@ -36,6 +36,7 @@ if TYPE_CHECKING:
 class SerializedCase:
     # Case data
     id: str
+    generation_time: float
     path_parameters: dict[str, Any] | None
     headers: dict[str, Any] | None
     cookies: dict[str, Any] | None
@@ -60,6 +61,7 @@ class SerializedCase:
         serialized_body = _serialize_body(request_data.body)
         return cls(
             id=case.id,
+            generation_time=case.generation_time,
             path_parameters=case.path_parameters,
             headers=dict(case.headers) if case.headers is not None else None,
             cookies=case.cookies,

{schemathesis-3.26.0 → schemathesis-3.26.1}/src/schemathesis/service/serialization.py

@@ -60,6 +60,8 @@ def serialize_before_execution(event: events.BeforeExecution) -> dict[str, Any]
 
 def _serialize_case(case: SerializedCase) -> dict[str, Any]:
     return {
+        "id": case.id,
+        "generation_time": case.generation_time,
         "verbose_name": case.verbose_name,
         "path_template": case.path_template,
         "path_parameters": stringify_path_parameters(case.path_parameters),

{schemathesis-3.26.0 → schemathesis-3.26.1}/src/schemathesis/specs/graphql/schemas.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import enum
+import time
 from dataclasses import dataclass, field
 from difflib import get_close_matches
 from enum import unique
@@ -287,6 +288,7 @@ class GraphQLSchema(BaseSchema):
             query=query,
             body=body,
             media_type=media_type,
+            generation_time=0.0,
         )
 
     def get_tags(self, operation: APIOperation) -> list[str] | None:
@@ -337,6 +339,7 @@ def get_case_strategy(
     generation_config: GenerationConfig | None = None,
     **kwargs: Any,
 ) -> Any:
+    start = time.monotonic()
     definition = cast(GraphQLOperationDefinition, operation.definition)
     strategy_factory = {
         RootType.QUERY: gql_st.queries,
@@ -369,6 +372,7 @@ def get_case_strategy(
         body=body,
         operation=operation,
         data_generation_method=data_generation_method,
+        generation_time=time.monotonic() - start,
     )  # type: ignore
     context = auths.AuthContext(
         operation=operation,

{schemathesis-3.26.0 → schemathesis-3.26.1}/src/schemathesis/specs/openapi/_hypothesis.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 import string
+import time
 from base64 import b64encode
 from contextlib import suppress
 from dataclasses import dataclass
@@ -131,6 +132,7 @@ def get_case_strategy(
     The primary purpose of this behavior is to prevent sending incomplete explicit examples by generating missing parts
     as it works with `body`.
     """
+    start = time.monotonic()
     strategy_factory = DATA_GENERATION_METHOD_TO_STRATEGY_FACTORY[generator]
 
     context = HookContext(operation)
@@ -193,6 +195,7 @@ def get_case_strategy(
             reject()
     instance = Case(
         operation=operation,
+        generation_time=time.monotonic() - start,
         media_type=media_type,
         path_parameters=path_parameters_.value,
         headers=CaseInsensitiveDict(headers_.value) if headers_.value is not None else headers_.value,

{schemathesis-3.26.0 → schemathesis-3.26.1}/src/schemathesis/specs/openapi/schemas.py

@@ -953,6 +953,7 @@ class SwaggerV20(BaseOpenAPISchema):
             query=query,
             body=body,
             media_type=media_type,
+            generation_time=0.0,
         )
 
     def _get_consumes_for_operation(self, definition: dict[str, Any]) -> list[str]:

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/cli/output/test_default.py

@@ -125,8 +125,12 @@ def test_handle_initialized(capsys, mocker, execution_context, results_set, swag
 
 def test_display_statistic(capsys, swagger_20, execution_context, operation, response):
     # Given multiple successful & failed checks in a single test
-    success = models.Check("not_a_server_error", models.Status.success, response, 0, models.Case(operation))
-    failure = models.Check("not_a_server_error", models.Status.failure, response, 0, models.Case(operation))
+    success = models.Check(
+        "not_a_server_error", models.Status.success, response, 0, models.Case(operation, generation_time=0.0)
+    )
+    failure = models.Check(
+        "not_a_server_error", models.Status.failure, response, 0, models.Case(operation, generation_time=0.0)
+    )
     single_test_statistic = models.TestResult(
         method=operation.method,
         path=operation.full_path,
@@ -138,7 +142,9 @@ def test_display_statistic(capsys, swagger_20, execution_context, operation, res
             success,
             failure,
             failure,
-            models.Check("different_check", models.Status.success, response, 0, models.Case(operation)),
+            models.Check(
+                "different_check", models.Status.success, response, 0, models.Case(operation, generation_time=0.0)
+            ),
         ],
     )
     results = models.TestResultSet(seed=42, results=[single_test_statistic])
@@ -232,8 +238,12 @@ def test_display_hypothesis_output(capsys):
 @pytest.mark.parametrize("body", ({}, {"foo": "bar"}, NOT_SET))
 def test_display_single_failure(capsys, swagger_20, execution_context, operation, body, response):
     # Given a single test result with multiple successful & failed checks
-    success = models.Check("not_a_server_error", models.Status.success, response, 0, models.Case(operation, body=body))
-    failure = models.Check("not_a_server_error", models.Status.failure, response, 0, models.Case(operation, body=body))
+    success = models.Check(
+        "not_a_server_error", models.Status.success, response, 0, models.Case(operation, generation_time=0.0, body=body)
+    )
+    failure = models.Check(
+        "not_a_server_error", models.Status.failure, response, 0, models.Case(operation, generation_time=0.0, body=body)
+    )
     test_statistic = models.TestResult(
         method=operation.method,
         path=operation.full_path,
@@ -245,7 +255,13 @@ def test_display_single_failure(capsys, swagger_20, execution_context, operation
             success,
             failure,
             failure,
-            models.Check("different_check", models.Status.success, response, 0, models.Case(operation, body=body)),
+            models.Check(
+                "different_check",
+                models.Status.success,
+                response,
+                0,
+                models.Case(operation, generation_time=0.0, body=body),
+            ),
         ],
     )
     # When this failure is displayed

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/cli/test_commands.py

@@ -1029,9 +1029,9 @@ def test_keyboard_interrupt(cli, cli_args, base_url, mocker, flask_app, swagger_
     operation = APIOperation("/success", "GET", {}, swagger_20, base_url=base_url)
     if len(cli_args) == 2:
         operation.app = flask_app
-        original = Case(operation).call_wsgi
+        original = Case(operation, generation_time=0.0).call_wsgi
     else:
-        original = Case(operation).call
+        original = Case(operation, generation_time=0.0).call
     counter = 0
 
     def mocked(*args, **kwargs):

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/code_samples/test_curl.py

@@ -21,7 +21,9 @@ def test_as_curl_command(case: Case, headers, curl):
 
 
 def test_non_utf_8_body(curl):
-    case = Case(operation=schema["/users"]["GET"], body=b"42\xff", media_type="application/octet-stream")
+    case = Case(
+        operation=schema["/users"]["GET"], generation_time=0.0, body=b"42\xff", media_type="application/octet-stream"
+    )
     command = case.as_curl_command()
     assert command == "curl -X GET -H 'Content-Type: application/octet-stream' -d '42�' http://localhost/users"
     curl.assert_valid(command)
@@ -30,7 +32,9 @@ def test_non_utf_8_body(curl):
 def test_json_payload(curl):
     new_app = create_app(operations=["create_user"])
     schema = schemathesis.from_dict(new_app.openapi(), force_schema_version="30")
-    case = Case(operation=schema["/users/"]["POST"], body={"foo": 42}, media_type="application/json")
+    case = Case(
+        operation=schema["/users/"]["POST"], generation_time=0.0, body={"foo": 42}, media_type="application/json"
+    )
     command = case.as_curl_command()
     assert command == "curl -X POST -H 'Content-Type: application/json' -d '{\"foo\": 42}' http://localhost/users/"
     curl.assert_valid(command)
@@ -40,7 +44,7 @@ def test_explicit_headers(curl):
     # When the generated case contains a header from the list of headers that are ignored by default
     name = "Accept"
     value = "application/json"
-    case = Case(operation=schema["/users"]["GET"], headers={name: value})
+    case = Case(operation=schema["/users"]["GET"], generation_time=0.0, headers={name: value})
     command = case.as_curl_command()
     assert command == f"curl -X GET -H '{name}: {value}' http://localhost/users"
     curl.assert_valid(command)

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/conftest.py

@@ -1165,7 +1165,7 @@ def response_factory():
 def case_factory(swagger_20):
     def factory(**kwargs):
         kwargs.setdefault("operation", swagger_20["/users"]["get"])
-        return Case(**kwargs)
+        return Case(generation_time=0.0, **kwargs)
 
     return factory
 

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/hooks/test_hooks.py

@@ -388,6 +388,7 @@ def test_before_add_examples(testdir, simple_openapi):
 def before_add_examples(context, examples):
     new = schemathesis.models.Case(
         operation=context.operation,
+        generation_time=0.0,
         query={"foo": "bar"}
     )
     examples.append(new)
@@ -401,6 +402,7 @@ def test_a(case):
 def another_hook(context, examples):
     new = schemathesis.models.Case(
         operation=context.operation,
+        generation_time=0.0,
         query={"spam": "baz"}
     )
     examples.append(new)

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/runner/test_checks.py

@@ -27,7 +27,7 @@ def make_case(schema: BaseSchema, definition: dict[str, Any]) -> models.Case:
     operation = models.APIOperation(
         "/path", "GET", definition=OperationDefinition(definition, definition, None, []), schema=schema
     )
-    return models.Case(operation)
+    return models.Case(operation, generation_time=0.0)
 
 
 @pytest.fixture()
@@ -187,7 +187,7 @@ def test_content_type_conformance_another_status_code(response_factory):
 def assert_content_type_conformance(response_factory, raw_schema, content_type, is_error, match=None):
     schema = schemathesis.from_dict(raw_schema)
     operation = schema["/users"]["get"]
-    case = models.Case(operation)
+    case = models.Case(operation, generation_time=0.0)
     response = response_factory.requests(content_type=content_type)
     if not is_error:
         assert content_type_conformance(response, case) is None
@@ -250,7 +250,7 @@ def test_invalid_schema_on_content_type_check(response_factory):
         validate_schema=False,
     )
     operation = schema["/users"]["get"]
-    case = models.Case(operation)
+    case = models.Case(operation, generation_time=0.0)
     response = response_factory.requests(content_type="application/json")
     # Then an error should be risen
     with pytest.raises(OperationSchemaError):

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/specs/openapi/test_expressions.py

@@ -26,6 +26,7 @@ def operation():
 def case(operation):
     return Case(
         operation,
+        generation_time=0.0,
         path_parameters={"user_id": 5},
         query={"username": "foo"},
         headers={"X-Token": "secret"},

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/specs/openapi/test_links.py

@@ -40,7 +40,7 @@ LINK = Link(
 
 @pytest.fixture(scope="module")
 def case():
-    return Case(API_OPERATION)
+    return Case(API_OPERATION, generation_time=0.0)
 
 
 @pytest.fixture(scope="module")

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/test_asgi.py

@@ -89,7 +89,7 @@ def test_null_byte(fastapi_app):
 
 
 def test_not_app_with_asgi(schema):
-    case = Case(schema["/users"]["GET"])
+    case = Case(schema["/users"]["GET"], generation_time=0.0)
     case.operation.app = None
     with pytest.raises(
         RuntimeError,

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/test_direct_access.py

@@ -1,3 +1,5 @@
+from unittest.mock import ANY
+
 import pytest
 from hypothesis import strategies as st
 
@@ -46,7 +48,9 @@ def test_as_strategy(swagger_20):
     operation = swagger_20["/users"]["GET"]
     strategy = operation.as_strategy()
     assert isinstance(strategy, st.SearchStrategy)
-    assert strategy.example() == Case(operation, data_generation_method=DataGenerationMethod.positive)
+    assert strategy.example() == Case(
+        operation, generation_time=ANY, data_generation_method=DataGenerationMethod.positive
+    )
 
 
 @pytest.mark.filterwarnings("ignore:.*method is good for exploring strategies.*")

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/test_hypothesis.py

@@ -1,5 +1,6 @@
 import datetime
 from base64 import b64decode
+from unittest.mock import ANY
 
 import pytest
 from hypothesis import HealthCheck, assume, find, given, settings
@@ -71,7 +72,11 @@ def test_get_examples(location, swagger_20):
     strategies = operation.get_strategies_from_examples()
     assert len(strategies) == 1
     assert strategies[0].example() == Case(
-        operation, data_generation_method=DataGenerationMethod.positive, media_type=media_type, **{container: expected}
+        operation,
+        generation_time=ANY,
+        data_generation_method=DataGenerationMethod.positive,
+        media_type=media_type,
+        **{container: expected},
     )
 
 

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/test_lazy.py

@@ -508,7 +508,8 @@ def test_b(case):
     result.assert_outcomes(passed=2)
 
 
-def test_parametrized_fixture(testdir, openapi3_base_url, is_older_subtests):
+@pytest.mark.parametrize("settings", ("", "@settings(deadline=None)"))
+def test_parametrized_fixture(testdir, openapi3_base_url, is_older_subtests, settings):
     # When the used pytest fixture is parametrized via `params`
     testdir.make_test(
         f"""
@@ -521,6 +522,7 @@ def parametrized_lazy_schema(request):
 lazy_schema = schemathesis.from_pytest_fixture("parametrized_lazy_schema")
 
 @lazy_schema.parametrize()
+{settings}
 def test_(case):
     case.call()
 """,

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/test_models.py

@@ -223,6 +223,7 @@ def test_case_partial_deepcopy(swagger_20):
     media_type = "application/json"
     original_case = Case(
         operation=operation,
+        generation_time=0.0,
         media_type=media_type,
         path_parameters={"test": "test"},
         headers={"Content-Type": "application/json"},
@@ -252,6 +253,7 @@ def test_case_partial_deepcopy_same_generated_code(swagger_20):
     operation = APIOperation("/example/path", "GET", {}, swagger_20)
     original_case = Case(
         operation=operation,
+        generation_time=0.0,
         media_type="application/json",
         path_parameters={"test": "test"},
         headers={"Content-Type": "application/json"},
@@ -267,11 +269,11 @@ def test_case_partial_deepcopy_same_generated_code(swagger_20):
 
 def test_case_partial_deepcopy_source(swagger_20):
     operation = APIOperation("/example/path", "GET", {}, swagger_20)
-    original_case = Case(operation=operation)
+    original_case = Case(operation=operation, generation_time=0.0)
     response = requests.Response()
     response.status_code = 500
     original_case.source = CaseSource(
-        case=Case(operation=operation, query={"first": 1}), response=response, elapsed=1.0
+        case=Case(operation=operation, generation_time=0.0, query={"first": 1}), response=response, elapsed=1.0
     )
     copied_case = original_case.partial_deepcopy()
     assert copied_case.source.case.query == original_case.source.case.query
@@ -403,7 +405,7 @@ def test_response_from_requests(base_url):
 )
 def test_from_case(swagger_20, base_url, expected):
     operation = APIOperation("/users/{name}", "GET", {}, swagger_20, base_url="http://127.0.0.1/api/v3")
-    case = Case(operation, path_parameters={"name": "test"})
+    case = Case(operation, generation_time=0.0, path_parameters={"name": "test"})
     session = requests.Session()
     request = Request.from_case(case, session)
     assert request.uri == "http://127.0.0.1/api/v3/users/test"
@@ -428,7 +430,7 @@ def test_method_suggestion(swagger_20):
 
 def test_deprecated_attribute(swagger_20):
     operation = APIOperation("/users/{name}", "GET", {}, swagger_20, base_url="http://127.0.0.1/api/v3")
-    case = Case(operation)
+    case = Case(operation, generation_time=0.0)
     with pytest.warns(Warning) as records:
         assert case.endpoint == case.operation == operation
     assert str(records[0].message) == (
@@ -563,6 +565,7 @@ def test_call_overrides(mocker, arg, openapi_30):
     original = {"A": "X", "B": "X"}
     case = Case(
         openapi_30["/users"]["GET"],
+        generation_time=0.0,
         headers=original,
         cookies=original,
         query=original,
@@ -588,6 +591,7 @@ def test_call_wsgi_overrides(mocker, arg, openapi_30):
     original = {"A": "X", "B": "X"}
     case = Case(
         openapi_30["/users"]["GET"],
+        generation_time=0.0,
         headers=original,
         query=original,
     )

{schemathesis-3.26.0 → schemathesis-3.26.1}/test/test_wsgi.py

@@ -70,7 +70,7 @@ def test_form_data(schema):
 
 def test_not_wsgi(schema):
     # When a schema is created without a WSGI app (e.g. from a URL)
-    case = Case(schema["/success"]["GET"])
+    case = Case(schema["/success"]["GET"], generation_time=0.0)
     case.operation.app = None
     # Then an error should be raised if the user tries to use `call_wsgi`
     with pytest.raises(