[cppyy] Fix std::string return-type tests to match Pythonizations

bindings/pyroot/cppyy/cppyy/test/test_regression.py

@@ -1,4 +1,4 @@
 import os, sys, pytest
 from pytest import mark, raises, skip
 from support import setup_make, IS_WINDOWS, ispypy, IS_MAC, IS_MAC_ARM
 
@@ -7,7 +7,7 @@
     helpout = []
 
     def setup_class(cls):
         import cppyy
 
         if sys.hexversion < 0x30d0000:
             def stringpager(text, cls=cls):
@@ -22,7 +22,7 @@
     def test01_kdcraw(self):
         """Doc strings for KDcrawIface (used to crash)."""
 
         import cppyy, pydoc
 
         # TODO: run a find for these paths
         qtpath = "/usr/include/qt5"
@@ -54,9 +54,9 @@
         if ispypy:
             skip('hangs (??) in pypy')
 
         import cppyy, pydoc
 
         assert not '__abstractmethods__' in dir(cppyy.gbl.gInterpreter)
         assert '__class__' in dir(cppyy.gbl.gInterpreter)
 
         self.__class__.helpout = []
@@ -68,7 +68,7 @@
 
         cppyy.cppdef("namespace cppyy_regression_test { void iii() {}; }")
 
         assert not 'iii' in cppyy.gbl.cppyy_regression_test.__dict__
         assert not '__abstractmethods__' in dir(cppyy.gbl.cppyy_regression_test)
         assert '__class__' in dir(cppyy.gbl.cppyy_regression_test)
         assert 'iii' in dir(cppyy.gbl.cppyy_regression_test)
@@ -473,7 +473,6 @@
 
         assert a != b             # derived class' C++ operator!= called
 
-    @mark.xfail(strict=True)
     def test18_operator_plus_overloads(self):
         """operator+(string, string) should return a string"""
 
@@ -485,7 +484,10 @@
         assert a == 'a'
         assert b == 'b'
 
-        assert type(a+b) == cppyy.gbl.std.string
+        # Expect same return type as other funcs returning a std::string in
+        # C++, which might be different from gbl.std.string on the Python side
+        # depending on the enabled Pythonizations.
+        assert type(a + b) == type(cppyy.gbl.std.to_string(42))
         assert a+b == 'ab'
 
     def test19_std_string_hash(self):

bindings/pyroot/cppyy/cppyy/test/test_templates.py

@@ -1142,7 +1142,6 @@ def test33_using_template_argument(self):
         assert ns.testptr
         assert cppyy.gbl.std.vector[ns.testptr]
 
-    @mark.xfail(strict=True)
     def test34_cstring_template_argument(self):
         """`const char*` use over std::string"""
 
@@ -1160,7 +1159,10 @@ def test34_cstring_template_argument(self):
 
         ns = cppyy.gbl.CStringTemplateArg
 
-        assert type(ns.stringify("Alice")) == cppyy.gbl.std.string
+        # Expect same return type as other funcs returning a std::string in
+        # C++, which might be different from gbl.std.string on the Python side
+        # depending on the enabled Pythonizations.
+        assert type(ns.stringify("Alice")) == type(cppyy.gbl.std.to_string(42))
         assert ns.stringify("Alice", "Bob")                          == "Alice Bob "
         assert ns.stringify(1, 2, 3)                                 == "1 2 3 "
         assert ns.stringify["const char*"]("Aap")                    == "Aap "