diff --git a/test/test_leakcheck.py b/test/test_leakcheck.py index cde9bfc..6e02f08 100644 --- a/test/test_leakcheck.py +++ b/test/test_leakcheck.py @@ -2,7 +2,6 @@ import sys from pytest import mark, skip -from support import IS_MAC, IS_MAC_X86 nopsutil = False try: @@ -11,7 +10,7 @@ nopsutil = True -@mark.skipif(nopsutil == True, reason="module psutil not installed") +@mark.skip(reason="disabled due to its sporadic nature, especially fragile on VMs") class TestLEAKCHECK: def setup_class(cls): import psutil @@ -75,9 +74,6 @@ def check_func(self, scope, func, *args, **kwds): assert fail < M - @mark.xfail( - condition=IS_MAC, reason="std::string overload fails to resolve on OS X" - ) def test01_free_functions(self): """Leak test of free functions""" @@ -103,9 +99,6 @@ def test01_free_functions(self): self.check_func(ns, "free_f_ret1") self.check_func(ns, "free_f_ret1") - @mark.xfail( - condition=IS_MAC, reason="std::string overload fails to resolve on OS X" - ) def test02_test_static_methods(self): """Leak test of static methods""" @@ -132,9 +125,6 @@ class MyClass02 { self.check_func(m, "static_method_ol", 42.0, tmpl_args="float") self.check_func(m, "static_method_ret") - @mark.xfail( - condition=IS_MAC, reason="std::string overload fails to resolve on OS X" - ) def test03_test_methods(self): """Leak test of methods""" @@ -264,11 +254,6 @@ class Leaker { obj = ns.Leaker() self.check_func(obj, "leak_string", 2048) - @mark.xfail( - condition=IS_MAC_X86, - strict=False, - reason="RSS threshold intermittently trips on the Intel-mac runners", - ) def test08_list_creation(self): """Leak check of creating a python list from an std::list"""