2 files changed, 2 insertions, 40 deletions

diff --git a/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch b/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch
deleted file mode 100644
index f024e79d93..0000000000
--- a/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e184fb950ad3b52c5c16438d39fe4d516c784e30 Mon Sep 17 00:00:00 2001
-From: Trevor Gamblin <tgamblin@baylibre.com>
-Date: Thu, 12 Oct 2023 17:32:40 -0400
-Subject: [PATCH] test_pytest_mock: skip args introspection tests
-
-Disable these two tests for now so that python3-pytest-mock can have
-successful ptest runs.
-
-Upstream-Status: Inappropriate [OE-Specific]
-
-Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
----
- tests/test_pytest_mock.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py
-index 3d53241..157b6c3 100644
---- a/tests/test_pytest_mock.py
-+++ b/tests/test_pytest_mock.py
-@@ -581,6 +581,7 @@ def test_assert_called_wrapper(mocker: MockerFixture) -> None:
-     stub.assert_called()
- 
- 
-+@pytest.mark.skip("Async not correctly detected, skip for now")
- @pytest.mark.usefixtures("needs_assert_rewrite")
- def test_assert_called_args_with_introspection(mocker: MockerFixture) -> None:
-     stub = mocker.stub()
-@@ -597,6 +598,7 @@ def test_assert_called_args_with_introspection(mocker: MockerFixture) -> None:
-         stub.assert_called_once_with(*wrong_args)
- 
- 
-+@pytest.mark.skip("Async not correctly detected, skip for now")
- @pytest.mark.usefixtures("needs_assert_rewrite")
- def test_assert_called_kwargs_with_introspection(mocker: MockerFixture) -> None:
-     stub = mocker.stub()
--- 
-2.41.0
-
diff --git a/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest b/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest
index 8d2017d39c..51ae892b01 100644
--- a/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest
+++ b/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest
@@ -1,3 +1,3 @@
 #!/bin/sh
-
-pytest --automake
+# see https://github.com/pytest-dev/pytest-mock/issues/102 for reasons to use plain asserts
+pytest --automake --assert=plain