revert change which broke python 2 tests

psutil/tests/__init__.py

@@ -913,9 +913,27 @@ def get_testfn(suffix="", dir=None):
 # ===================================================================
 
 
-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

@@ -398,7 +398,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

setup.py

@@ -80,7 +80,6 @@
         "pytest-xdist",
         "pytest==4.6.11",
         "setuptools",
-        "unittest2",
     ]
 if WINDOWS and not PYPY:
     TEST_DEPS.append("pywin32")