rename deco

7 files changed, 16 insertions, 16 deletions

diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py
index 0140f216..b864d475 100644
--- a/psutil/tests/__init__.py
+++ b/psutil/tests/__init__.py
@@ -798,12 +798,12 @@ class TestCase(unittest.TestCase):
         assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
 
 
-def unittest_serial_run(klass):
+def serialtest(klass):
     """A decorator to mark a TestCase class. When running parallel tests,
     class' unit tests will be run serially (1 process).
     """
     # assert issubclass(klass, unittest.TestCase), klass
-    klass._unittest_serial_run = True
+    klass._serialtest = True
     return klass
 
 
diff --git a/psutil/tests/runner.py b/psutil/tests/runner.py
index c1c9dc93..181168cf 100755
--- a/psutil/tests/runner.py
+++ b/psutil/tests/runner.py
@@ -128,7 +128,7 @@ class _Runner:
         parallel = unittest.TestSuite()
         for obj in self._iter_testmod_classes():
             test = loadTestsFromTestCase(obj)
-            if getattr(obj, '_unittest_serial_run', False):
+            if getattr(obj, '_serialtest', False):
                 serial.addTest(test)
             else:
                 parallel.addTest(test)
diff --git a/psutil/tests/test_connections.py b/psutil/tests/test_connections.py
index 2fdab965..dd5f3513 100755
--- a/psutil/tests/test_connections.py
+++ b/psutil/tests/test_connections.py
@@ -41,6 +41,7 @@ from psutil.tests import get_testfn
 from psutil.tests import HAS_CONNECTIONS_UNIX
 from psutil.tests import pyrun
 from psutil.tests import reap_children
+from psutil.tests import serialtest
 from psutil.tests import skip_on_access_denied
 from psutil.tests import SKIP_SYSCONS
 from psutil.tests import tcp_socketpair
@@ -48,14 +49,13 @@ from psutil.tests import TRAVIS
 from psutil.tests import unittest
 from psutil.tests import unix_socketpair
 from psutil.tests import wait_for_file
-from psutil.tests import unittest_serial_run
 
 
 thisproc = psutil.Process()
 SOCK_SEQPACKET = getattr(socket, "SOCK_SEQPACKET", object())
 
 
-@unittest_serial_run
+@serialtest
 class _ConnTestCase(unittest.TestCase):
 
     def setUp(self):
@@ -185,7 +185,7 @@ class TestBasicOperations(_ConnTestCase):
         self.assertRaises(ValueError, psutil.net_connections, kind='???')
 
 
-@unittest_serial_run
+@serialtest
 class TestUnconnectedSockets(_ConnTestCase):
     """Tests sockets which are open but not connected to anything."""
 
@@ -282,7 +282,7 @@ class TestUnconnectedSockets(_ConnTestCase):
             self.assertEqual(conn.status, psutil.CONN_NONE)
 
 
-@unittest_serial_run
+@serialtest
 class TestConnectedSocket(_ConnTestCase):
     """Test socket pairs which are are actually connected to
     each other.
diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
index dac7c465..fa574923 100755
--- a/psutil/tests/test_process.py
+++ b/psutil/tests/test_process.py
@@ -57,6 +57,7 @@ from psutil.tests import PYPY
 from psutil.tests import PYTHON_EXE
 from psutil.tests import reap_children
 from psutil.tests import retry_on_failure
+from psutil.tests import serialtest
 from psutil.tests import sh
 from psutil.tests import skip_on_access_denied
 from psutil.tests import skip_on_not_implemented
@@ -64,14 +65,13 @@ from psutil.tests import ThreadTask
 from psutil.tests import TRAVIS
 from psutil.tests import unittest
 from psutil.tests import wait_for_pid
-from psutil.tests import unittest_serial_run
 
 
 # ===================================================================
 # --- psutil.Process class tests
 # ===================================================================
 
-@unittest_serial_run
+@serialtest
 class TestProcess(unittest.TestCase):
     """Tests for psutil.Process class."""
 
diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
index 79ab5251..0b3bde64 100755
--- a/psutil/tests/test_system.py
+++ b/psutil/tests/test_system.py
@@ -48,10 +48,10 @@ from psutil.tests import mock
 from psutil.tests import PYPY
 from psutil.tests import reap_children
 from psutil.tests import retry_on_failure
+from psutil.tests import serialtest
 from psutil.tests import TRAVIS
 from psutil.tests import UNICODE_SUFFIX
 from psutil.tests import unittest
-from psutil.tests import unittest_serial_run
 
 
 # ===================================================================
@@ -59,7 +59,7 @@ from psutil.tests import unittest_serial_run
 # ===================================================================
 
 
-@unittest_serial_run
+@serialtest
 class TestProcessAPIs(unittest.TestCase):
 
     def tearDown(self):
diff --git a/psutil/tests/test_testutils.py b/psutil/tests/test_testutils.py
index 9bcd3dd6..787d958c 100755
--- a/psutil/tests/test_testutils.py
+++ b/psutil/tests/test_testutils.py
@@ -43,10 +43,10 @@ from psutil.tests import retry
 from psutil.tests import retry_on_failure
 from psutil.tests import safe_mkdir
 from psutil.tests import safe_rmpath
+from psutil.tests import serialtest
 from psutil.tests import tcp_socketpair
 from psutil.tests import TestMemoryLeak
 from psutil.tests import unittest
-from psutil.tests import unittest_serial_run
 from psutil.tests import unix_socketpair
 from psutil.tests import wait_for_file
 from psutil.tests import wait_for_pid
@@ -208,7 +208,7 @@ class TestFSTestUtils(unittest.TestCase):
         self.assertEqual(os.getcwd(), base)
 
 
-@unittest_serial_run
+@serialtest
 class TestProcessUtils(unittest.TestCase):
 
     def test_reap_children(self):
@@ -318,7 +318,7 @@ class TestNetUtils(unittest.TestCase):
             self.assertGreaterEqual(types[socket.SOCK_DGRAM], 2)
 
 
-@unittest_serial_run
+@serialtest
 class TestMemLeakClass(TestMemoryLeak):
 
     def test_times(self):
diff --git a/psutil/tests/test_unicode.py b/psutil/tests/test_unicode.py
index 3218b5a7..f9ec2b15 100755
--- a/psutil/tests/test_unicode.py
+++ b/psutil/tests/test_unicode.py
@@ -102,12 +102,12 @@ from psutil.tests import PYPY
 from psutil.tests import reap_children
 from psutil.tests import safe_mkdir
 from psutil.tests import safe_rmpath as _safe_rmpath
+from psutil.tests import serialtest
 from psutil.tests import skip_on_access_denied
 from psutil.tests import TESTFN_PREFIX
 from psutil.tests import TRAVIS
 from psutil.tests import UNICODE_SUFFIX
 from psutil.tests import unittest
-from psutil.tests import unittest_serial_run
 import psutil
 
 
@@ -155,7 +155,7 @@ def subprocess_supports_unicode(suffix):
 # ===================================================================
 
 
-@unittest_serial_run
+@serialtest
 class _BaseFSAPIsTests(object):
     funky_suffix = None