diff options
| -rw-r--r-- | psutil/_psutil_common.h | 8 | ||||
| -rwxr-xr-x | psutil/tests/test_process.py | 3 | ||||
| -rw-r--r-- | psutil/tests/test_unicode.py | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/psutil/_psutil_common.h b/psutil/_psutil_common.h index e91bf2dd..2fccab81 100644 --- a/psutil/_psutil_common.h +++ b/psutil/_psutil_common.h @@ -29,11 +29,11 @@ static const int PSUTIL_CONN_NONE = 128; // --- _Py_PARSE_PID -// SIZEOF_INT|LONG is missing on Linux + PyPy (only?) -// SIZEOF_PID_T is missing on Windows + Python2 -// In we can't determine we assume PID is an (int). +// SIZEOF_INT|LONG is missing on Linux + PyPy (only?). +// SIZEOF_PID_T is missing on Windows + Python2. +// In we can't determine pid_t size we assume it's an (int). // On major UNIX platforms I've seen pid_t is treated as int. -// On Windows _getpid() returns an int. We can't be 100% certain though, +// _getpid() on Windows returns an int. We can't be 100% sure though, // (in that case we'd probably get compiler warnings). #if !defined(SIZEOF_INT) #define SIZEOF_INT 4 diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py index 5728f183..0277a56a 100755 --- a/psutil/tests/test_process.py +++ b/psutil/tests/test_process.py @@ -727,6 +727,7 @@ class TestProcess(unittest.TestCase): else: raise + @unittest.skipIf(PYPY, "broken on PYPY") def test_long_cmdline(self): create_exe(TESTFN) self.addCleanup(safe_rmpath, TESTFN) @@ -741,6 +742,7 @@ class TestProcess(unittest.TestCase): pyexe = os.path.basename(os.path.realpath(sys.executable)).lower() assert pyexe.startswith(name), (pyexe, name) + @unittest.skipIf(PYPY, "unreliable on PYPY") def test_long_name(self): long_name = TESTFN + ("0123456789" * 2) create_exe(long_name) @@ -752,6 +754,7 @@ class TestProcess(unittest.TestCase): # XXX @unittest.skipIf(SUNOS, "broken on SUNOS") @unittest.skipIf(AIX, "broken on AIX") + @unittest.skipIf(PYPY, "broken on PYPY") def test_prog_w_funky_name(self): # Test that name(), exe() and cmdline() correctly handle programs # with funky chars such as spaces and ")", see: diff --git a/psutil/tests/test_unicode.py b/psutil/tests/test_unicode.py index 91395ebf..eecd7dc4 100644 --- a/psutil/tests/test_unicode.py +++ b/psutil/tests/test_unicode.py @@ -298,6 +298,7 @@ class TestFSAPIs(_BaseFSAPIsTests, unittest.TestCase): @unittest.skipIf(PYPY and TRAVIS, "unreliable on PYPY + TRAVIS") @unittest.skipIf(MACOS and TRAVIS, "unreliable on TRAVIS") # TODO +@unittest.skipIf(PYPY, "unreliable on PYPY") @unittest.skipIf(not subprocess_supports_unicode(INVALID_NAME), "subprocess can't deal with invalid unicode") class TestFSAPIsWithInvalidPath(_BaseFSAPIsTests, unittest.TestCase): |