Update tags, refactors bad conditions

aaronj0 · aaronj0 · commit 15f7b5bfe0ed · 2025-04-01T10:58:40.000+02:00
diff --git a/test/test_boost.py b/test/test_boost.py
@@ -28,7 +28,7 @@ def test01_any_class(self):
 
         assert std.list[any]
 
-    @mark.xfail
+    @mark.skip
     def test02_any_usage(self):
         """boost::any assignment and casting"""
 
diff --git a/test/test_cpp11features.py b/test/test_cpp11features.py
@@ -44,7 +44,6 @@ def test01_smart_ptr(self):
             gc.collect()
             assert TestSmartPtr.s_counter == 0
 
-    @mark.xfail(run=False, reason="Crashes")
     def test02_smart_ptr_construction(self):
         """Shared/Unique pointer ctor is templated, requiring special care"""
 
@@ -72,7 +71,6 @@ class C(TestSmartPtr):
             gc.collect()
             assert TestSmartPtr.s_counter == 0
 
-    @mark.xfail(run=False, reason="Crashes")
     def test03_smart_ptr_memory_handling(self):
         """Test shared/unique pointer memory ownership"""
 
@@ -103,7 +101,7 @@ class C(TestSmartPtr):
             gc.collect()
             assert TestSmartPtr.s_counter == 0
 
-    @mark.xfail(run=False, reason="Crashes")
+    @mark.xfail
     def test04_shared_ptr_passing(self):
         """Ability to pass shared_ptr<Derived> through shared_ptr<Base>"""
 
@@ -143,6 +141,7 @@ def test04_shared_ptr_passing(self):
         gc.collect()
         assert TestSmartPtr.s_counter == 0
 
+    @mark.xfail
     def test05_unique_ptr_passing(self):
         """Ability to pass unique_ptr<Derived> through unique_ptr<Base>"""
 
@@ -408,7 +407,7 @@ def test13_stdhash(self):
             assert hash(sw)  == 17
             assert hash(sw)  == 17
 
-    @mark.xfail(run=False, reason="Crashes")
+    @mark.xfail
     def test14_shared_ptr_passing(self):
         """Ability to pass normal pointers through shared_ptr by value"""
 
@@ -434,7 +433,7 @@ def test14_shared_ptr_passing(self):
             gc.collect()
             assert TestSmartPtr.s_counter == 0
 
-    mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
+    @mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
     def test15_unique_ptr_template_deduction(self):
         """Argument type deduction with std::unique_ptr"""
 
diff --git a/test/test_crossinheritance.py b/test/test_crossinheritance.py
@@ -130,7 +130,7 @@ def get_value(self):
         assert c4.m_int == 88
         assert CX.IBase2.call_get_value(c4) == 77
 
-    @mark.xfail(condition=IS_MAC_ARM, run=not IS_MAC_ARM, reason="Crashes with exception not being caught on Apple Silicon")
+    @mark.xfail(run=False, condition=IS_MAC_ARM, reason="Crashes with exception not being caught on Apple Silicon")
     def test04_arguments(self):
         """Test ability to override functions that take arguments"""
 
@@ -405,7 +405,6 @@ def call(self):
         gc.collect()
         assert CB.s_count == 0 + start_count
 
-    @mark.xfail(run=False, reason="Crashes")
     def test12_python_shared_ptr_memory(self):
         """Usage of Python derived objects with std::shared_ptr"""
 
diff --git a/test/test_datatypes.py b/test/test_datatypes.py
@@ -1269,7 +1269,7 @@ def run(self, f, buf, total):
         if self.has_byte:
             run(self, cppyy.gbl.sum_byte_data, buf, total)
 
-    @mark.xfail(run=not(((IS_CLANG_REPL and IS_MAC) or (not IS_CLANG_REPL and IS_MAC))), reason="Crashes")
+    @mark.xfail(run=not(IS_MAC), reason="Crashes on OS X")
     def test26_function_pointers(self):
         """Function pointer passing"""
 
@@ -1332,7 +1332,7 @@ def sum_in_python(i1, i2, i3):
         ns = cppyy.gbl.FuncPtrReturn
         assert ns.foo()() == "Hello, World!"
 
-    @mark.xfail(run=False, condition=(IS_CLANG_REPL and IS_MAC) or (not IS_CLANG_REPL and IS_MAC), reason="Crashes")
+    @mark.xfail(run=False, condition=IS_MAC, reason="Crashes")
     def test27_callable_passing(self):
         """Passing callables through function pointers"""
 
@@ -2011,7 +2011,7 @@ class Atom {
         assert b.name     == "aap"
         assert b.buf_type == ns.SHAPE
 
-    @mark.xfail(run=not IS_CLANG_REPL, reason="Crashes")
+    @mark.xfail
     def test40_more_aggregates(self):
         """More aggregate testings (used to fail/report errors)"""
 
@@ -2049,7 +2049,6 @@ def test40_more_aggregates(self):
             r2 = ns.make_R2()
             assert r2.s.x == 1
 
-    @mark.xfail(run=False, reason="Fails")
     def test41_complex_numpy_arrays(self):
         """Usage of complex numpy arrays"""
 
@@ -2097,7 +2096,7 @@ def pycompdot(a, b, N):
             Ccl = func(Acl, Bcl, 2)
             assert complex(Ccl) == pyCcl
 
-    mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
+    @mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
     def test42_mixed_complex_arithmetic(self):
         """Mixin of Python and C++ std::complex in arithmetic"""
 
diff --git a/test/test_operators.py b/test/test_operators.py
@@ -337,7 +337,7 @@ def test14_single_argument_call(self):
         b = ns.Bar()
         assert b[42] == 42
 
-    mark.xfail(condition = (IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
+    @mark.xfail(condition = (IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
     def test15_class_and_global_mix(self):
         """Iterator methods have both class and global overloads"""
 
diff --git a/test/test_regression.py b/test/test_regression.py
@@ -1088,7 +1088,7 @@ def test37_array_of_pointers_argument(self):
 
             assert cppyy.addressof(res) == cppyy.addressof(arr)
 
-    mark.xfail(condition = (IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
+    @mark.xfail(condition = (IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
     def test38_char16_arrays(self):
         """Access to fixed-size char16 arrays as data members"""
 
diff --git a/test/test_stltypes.py b/test/test_stltypes.py
@@ -442,7 +442,7 @@ def test09_vector_of_string(self):
 
         raises(TypeError, cppyy.gbl.std.vector["std::string"], "abc")
 
-    mark.xfail(condition = (IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
+    @mark.xfail(condition = (IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
     def test10_vector_std_distance(self):
         """Use of std::distance with vector"""
 
diff --git a/test/test_templates.py b/test/test_templates.py
@@ -316,7 +316,7 @@ def test12_template_aliases(self):
         assert nsup.Foo
         assert nsup.Bar.Foo       # used to fail
 
-    mark.xfail(condition = (IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
+    @mark.xfail(condition = (IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
     def test13_using_templated_method(self):
         """Access to base class templated methods through 'using'"""
 
@@ -476,7 +476,7 @@ def test18_greedy_overloads(self):
         assert g3.get_size(ns.SomeClass()) == cppyy.sizeof(ns.SomeClass)
         assert g3.get_size(cppyy.nullptr, True) == -1
 
-    mark.xfail(condition = (IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
+    @mark.xfail(condition = (IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
     def test19_templated_operator_add(self):
         """Templated operator+ is ambiguous: either __pos__ or __add__"""
 
@@ -614,7 +614,7 @@ def callback(x):
 
         assert cppyy.gbl.std.function['double(std::vector<double>)']
 
-    @mark.xfail(run=(IS_MAC_ARM or IS_MAC_X86) and IS_CLANG_REPL)
+    @mark.xfail(run=(IS_MAC and IS_CLANG_REPL))
     def test25_stdfunction_ref_and_ptr_args(self):
         """Use of std::function with reference or pointer args"""
 
@@ -1119,7 +1119,7 @@ class TNaVU;
                         run_n = getattr(cppyy.gbl, 'TNaRun_%d' % n)
                         getattr(run_n, t)
 
-    @mark.xfail(run=not((IS_MAC_ARM or IS_MAC_X86) and not IS_CLANG_REPL))
+    @mark.xfail(run=False, condition=not(IS_MAC and not IS_CLANG_REPL), reason="Crashes on OS X + Cling")
     def test33_using_template_argument(self):
         """`using` type as template argument"""
 
