From b7e88af9975224f8a73147c8235dacc7cd3f848d Mon Sep 17 00:00:00 2001 From: Aaron Jomy Date: Mon, 30 Sep 2024 12:07:19 +0200 Subject: [PATCH] [test] Update tags --- test/test_advancedcpp.py | 1 - test/test_datatypes.py | 2 +- test/test_doc_features.py | 8 +++----- test/test_fragile.py | 2 -- test/test_lowlevel.py | 1 - test/test_stltypes.py | 3 --- test/test_streams.py | 1 - 7 files changed, 4 insertions(+), 14 deletions(-) diff --git a/test/test_advancedcpp.py b/test/test_advancedcpp.py index eb489e55..ae80ba1b 100644 --- a/test/test_advancedcpp.py +++ b/test/test_advancedcpp.py @@ -183,7 +183,6 @@ def test03a_namespace_lookup_on_update(self): assert gbl.a_ns.d_ns.i_class.j_class.s_j == 333 assert gbl.a_ns.d_ns.i_class.j_class().m_j == -10 - @mark.xfail(run=False, reason="Crashes") def test04_template_types(self): """Test bindings of templated types""" diff --git a/test/test_datatypes.py b/test/test_datatypes.py index 84e052c0..89553cbd 100644 --- a/test/test_datatypes.py +++ b/test/test_datatypes.py @@ -2055,7 +2055,7 @@ def test40_more_aggregates(self): r2 = ns.make_R2() assert r2.s.x == 1 - @mark.xfail(run=False, reason="Clang-Repl") + @mark.xfail(run=not IS_CLANG_REPL, reason="Clang-Repl") def test41_complex_numpy_arrays(self): """Usage of complex numpy arrays""" diff --git a/test/test_doc_features.py b/test/test_doc_features.py index 0b2fbd66..e905f6c8 100644 --- a/test/test_doc_features.py +++ b/test/test_doc_features.py @@ -1,6 +1,6 @@ import py, os, sys from pytest import raises, skip, mark -from .support import setup_make, ispypy, IS_WINDOWS, IS_CLANG_REPL, IS_CLANG_DEBUG, IS_MAC_X86, IS_MAC_ARM +from .support import setup_make, ispypy, IS_WINDOWS, IS_CLANG_REPL, IS_CLANG_DEBUG, IS_MAC, IS_MAC_X86, IS_MAC_ARM currpath = py.path.local(__file__).dirpath() test_dct = str(currpath.join("doc_helperDict")) @@ -575,7 +575,7 @@ def test02_python_introspection(self): assert not isinstance(i, int) assert isinstance(i, Integer1) - @mark.xfail(run=False, condition=(IS_MAC_ARM or IS_MAC_X86) and (not IS_CLANG_REPL), reason= "Crashes on OS X Cling") + @mark.xfail(run=(not IS_MAC and IS_CLANG_REPL), condition=IS_MAC and (not IS_CLANG_REPL), reason= "Crashes on OS X Cling") def test03_STL_containers(self): """Instantiate STL containers with new class""" @@ -852,7 +852,7 @@ def test03_use_of_ctypes_and_enum(self): assert list(arr) == [1, 42, 1, 42] cppyy.gbl.free(vp) - @mark.xfail(run=False, condition=(IS_MAC_ARM or IS_MAC_X86) and (not IS_CLANG_REPL), reason= "Crashes on OS X Cling") + @mark.xfail(run=(not IS_MAC and IS_CLANG_REPL), condition=IS_MAC and (not IS_CLANG_REPL), reason= "Crashes on OS X Cling") def test04_ptr_ptr_python_owns(self): """Example of ptr-ptr use where python owns""" @@ -994,7 +994,6 @@ def test08_voidptr_array(self): assert n.p[2] == 0x3 assert len(n.p) == 3 - @mark.xfail(condition=IS_CLANG_REPL, run=False, reason="Crashes with ClangRepl with 'toString not implemented'") def test09_custom_str(self): """Example of customized str""" @@ -1167,7 +1166,6 @@ def test_fallbacks(self): assert CC.passT(2**64-1) == 2**64-1 assert 'unsigned long long' in CC.passT.__doc__ - @mark.xfail(condition=IS_CLANG_REPL, run=False, reason="Crashes on Clang-REPL") def test_callbacks(self): """Function callback example""" diff --git a/test/test_fragile.py b/test/test_fragile.py index 83bff671..91c545e0 100644 --- a/test/test_fragile.py +++ b/test/test_fragile.py @@ -145,7 +145,6 @@ def test07_unnamed_enum(self): g = fragile.G() - @mark.xfail(condition=IS_CLANG_REPL, run=False, reason="Crashes on Clang-REPL") def test08_unhandled_scoped_datamember(self): """Test that an unhandled scoped data member does not cause infinite recursion""" @@ -476,7 +475,6 @@ def test19_gbl_contents(self): assert not 'ESysConstants' in dd assert not 'kDoRed' in dd - @mark.xfail(run=False, reason="Crashes") def test20_capture_output(self): """Capture cerr into a string""" diff --git a/test/test_lowlevel.py b/test/test_lowlevel.py index e89cef5b..cb06a7c6 100644 --- a/test/test_lowlevel.py +++ b/test/test_lowlevel.py @@ -369,7 +369,6 @@ def py2c(pyargs): with raises(TypeError): cppyy.gbl.ArrayOfCStrings.takes_array_of_cstrings(pyargs, len(pyargs)) - @mark.xfail(run=False, reason="Valgrind") def test11_array_of_const_char_ref(self): """Test passting of const char**&""" diff --git a/test/test_stltypes.py b/test/test_stltypes.py index 0c07003b..67607e79 100644 --- a/test/test_stltypes.py +++ b/test/test_stltypes.py @@ -838,7 +838,6 @@ def test04_array_of_strings(self): for k in range(2): assert str_array_4[i][j][k] == vals[i*4+j*2+k] - @mark.xfail(run=False, reason="Crashes with ClangRepl with 'toString not implemented' and fails on OS X Cling") def test05_stlstring_and_unicode(self): """Mixing unicode and std::string""" @@ -996,7 +995,6 @@ def EQ(result, init, methodname, *args): assert s.rfind('c') < 0 assert s.rfind('c') == s.npos - @mark.xfail(run=False, reason="Crashes with ClangRepl with 'toString not implemented' and fails on OS X Cling") def test10_string_in_repr_and_str_bytes(self): """Special cases for __str__/__repr__""" @@ -1578,7 +1576,6 @@ def test03_array_of_pointer_to_pods(self): assert gbl.ArrayTest.get_pa_px(a.data(), i) == 13*i assert gbl.ArrayTest.get_pa_py(a.data(), i) == 42*i - @mark.xfail(run=False, reason="Crashes") def test04_array_from_aggregate(self): """Initialize an array from an aggregate contructor""" diff --git a/test/test_streams.py b/test/test_streams.py index ea3d4ee6..42132cb2 100644 --- a/test/test_streams.py +++ b/test/test_streams.py @@ -32,7 +32,6 @@ def test02_std_cout(self): assert not (cppyy.gbl.std.cout is None) - @mark.xfail(run=False, reason="Crashes") def test03_consistent_naming_if_char_traits(self): """Naming consistency if char_traits"""