diff mbox series

[meta-python,kirkstone,2/2] python3-aspectlib: fix ptests

Message ID 20251031112342.674183-2-skandigraun@gmail.com
State New
Headers show
Series [meta-oe,kirkstone,1/2] libxml++: fix ptests | expand

Commit Message

Gyorgy Sarvari Oct. 31, 2025, 11:23 a.m. UTC 
Backport patch that adapts failing tests.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
 .../0001-fix-failing-ptests.patch             | 54 +++++++++++++++++++
 .../python/python3-aspectlib_1.5.2.bb         |  1 +
 2 files changed, 55 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-aspectlib/0001-fix-failing-ptests.patch
diff mbox series

Patch

diff --git a/meta-python/recipes-devtools/python/python3-aspectlib/0001-fix-failing-ptests.patch b/meta-python/recipes-devtools/python/python3-aspectlib/0001-fix-failing-ptests.patch
new file mode 100644
index 0000000000..8c07da67f0
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-aspectlib/0001-fix-failing-ptests.patch
@@ -0,0 +1,54 @@ 
+From 2b1e16fa9de6f444ed42c89b8d689e2607b6e358 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Sun, 19 Oct 2025 17:05:35 +0200
+Subject: [PATCH] fix failing ptests
+
+Some error messages in Python now include the classname also, so
+prepare the tests to expect these errors instead of the old version.
+
+This patch is the backport of a very small portion of this change:
+https://github.com/ionelmc/python-aspectlib/commit/ed4b036b9e69e195226faab719c470f77ad11cc2
+
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ tests/test_aspectlib_test.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_aspectlib_test.py b/tests/test_aspectlib_test.py
+index 05e2c25..db315a2 100644
+--- a/tests/test_aspectlib_test.py
++++ b/tests/test_aspectlib_test.py
+@@ -414,14 +414,14 @@ def test_story_empty_play_proxy_class():
+         (('stuff_1', 'mix', "'a', 'b'", ''), _Returns("(1, 2, 'a', 'b')")),
+         (('stuff_1', 'meth', "123", ''), _Raises(repr_ex(TypeError(
+             'meth() takes exactly 1 argument (2 given)' if PY2 else
+-            'meth() takes 1 positional argument but 2 were given'
++            'Stuff.meth() takes 1 positional argument but 2 were given'
+         )))),
+         ((None, 'test_pkg1.test_pkg2.test_mod.Stuff', "0, 1", ''), _Binds('stuff_2')),
+         (('stuff_2', 'mix', "'a', 'b'", ''), _Returns("(0, 1, 'a', 'b')")),
+         (('stuff_2', 'mix', "3, 4", ''), _Returns("(0, 1, 3, 4)")),
+         (('stuff_2', 'meth', "123", ''), _Raises(repr_ex(TypeError(
+             'meth() takes exactly 1 argument (2 given)' if PY2 else
+-            'meth() takes 1 positional argument but 2 were given'
++            'Stuff.meth() takes 1 positional argument but 2 were given'
+         ))))
+     ]))
+ 
+@@ -449,14 +449,14 @@ def test_story_half_play_proxy_class():
+         (('stuff_1', 'meth', '', ''), _Returns('None')),
+         (('stuff_1', 'meth', '123', ''), _Raises(repr_ex(TypeError(
+             'meth() takes exactly 1 argument (2 given)' if PY2 else
+-            'meth() takes 1 positional argument but 2 were given'
++            'Stuff.meth() takes 1 positional argument but 2 were given'
+         )))),
+         ((None, 'test_pkg1.test_pkg2.test_mod.Stuff', '0, 1', ''), _Binds("stuff_2")),
+         (('stuff_2', 'mix', "'a', 'b'", ''), _Returns("(0, 1, 'a', 'b')")),
+         (('stuff_2', 'mix',  '3, 4', ''), _Returns('(0, 1, 3, 4)')),
+         (('stuff_2', 'meth', '123', ''), _Raises(repr_ex(TypeError(
+             'meth() takes exactly 1 argument (2 given)' if PY2 else
+-            'meth() takes 1 positional argument but 2 were given'
++            'Stuff.meth() takes 1 positional argument but 2 were given'
+         ))))
+     ]))
+ 
diff --git a/meta-python/recipes-devtools/python/python3-aspectlib_1.5.2.bb b/meta-python/recipes-devtools/python/python3-aspectlib_1.5.2.bb
index 0cbeca21c7..ba4baefaf9 100644
--- a/meta-python/recipes-devtools/python/python3-aspectlib_1.5.2.bb
+++ b/meta-python/recipes-devtools/python/python3-aspectlib_1.5.2.bb
@@ -12,6 +12,7 @@  inherit ptest pypi setuptools3
 
 SRC_URI += "file://run-ptest \
             file://0001-Remove-tornado-6-test-constraint.-Ref-15.patch \
+            file://0001-fix-failing-ptests.patch \
            "
 
 do_install_ptest() {