merge from master

psutil/tests/__init__.py

@@ -75,6 +75,8 @@
 if PY3:
     import enum
 else:
+    import unittest2 as unittest
+
     enum = None
 
 if POSIX:
@@ -986,9 +988,27 @@ def __call__(self, cls_or_meth):
     pytest = fake_pytest
 
 
-class PsutilTestCase(unittest.TestCase):
+class TestCase(unittest.TestCase):
+    # ...otherwise multiprocessing.Pool complains
+    if not PY3:
+
+        def runTest(self):
+            pass
+
+        @contextlib.contextmanager
+        def subTest(self, *args, **kw):
+            # fake it for python 2.7
+            yield
+
+
+# monkey patch default unittest.TestCase
+unittest.TestCase = TestCase
+
+
+class PsutilTestCase(TestCase):
     """Test class providing auto-cleanup wrappers on top of process
-    test utilities.
+    test utilities. All test classes should derive from this one, even
+    if we use pytest.
     """
 
     def get_testfn(self, suffix="", dir=None):

psutil/tests/test_testutils.py

@@ -402,7 +402,7 @@ def test_leak_mem(self):
         ls = []
 
         def fun(ls=ls):
-            ls.append("x" * 124 * 1024)
+            ls.append("x" * 248 * 1024)
 
         try:
             # will consume around 60M in total