diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-11-12 02:04:41 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-11-12 02:04:41 +0100 |
commit | 0797f32c20b2b722cfb93752359fc4e67d5bdd88 (patch) | |
tree | f8b9bdc132f9dfb62b34d3bdb902cb2b8fb86120 | |
parent | 9383be7bf0bde4d4f4a7425ee3db8aaab0337a30 (diff) | |
download | psutil-0797f32c20b2b722cfb93752359fc4e67d5bdd88.tar.gz |
refactor PSUTIL_TESTING C APIs
-rw-r--r-- | psutil/_psutil_aix.c | 4 | ||||
-rw-r--r-- | psutil/_psutil_bsd.c | 4 | ||||
-rw-r--r-- | psutil/_psutil_common.c | 4 | ||||
-rw-r--r-- | psutil/_psutil_common.h | 2 | ||||
-rw-r--r-- | psutil/_psutil_linux.c | 4 | ||||
-rw-r--r-- | psutil/_psutil_osx.c | 4 | ||||
-rw-r--r-- | psutil/_psutil_sunos.c | 4 | ||||
-rw-r--r-- | psutil/_psutil_windows.c | 4 | ||||
-rw-r--r-- | psutil/tests/__init__.py | 6 |
9 files changed, 12 insertions, 24 deletions
diff --git a/psutil/_psutil_aix.c b/psutil/_psutil_aix.c index 3b188b85..a4ea584e 100644 --- a/psutil/_psutil_aix.c +++ b/psutil/_psutil_aix.c @@ -899,9 +899,7 @@ PsutilMethods[] = "Return CPU statistics"}, // --- others - {"py_psutil_is_testing", py_psutil_is_testing, METH_VARARGS, - "Return True if psutil is in testing mode"}, - {"py_psutil_set_testing", py_psutil_set_testing, METH_VARARGS, + {"set_testing", psutil_set_testing, METH_NOARGS, "Set psutil in testing mode"}, {NULL, NULL, 0, NULL} diff --git a/psutil/_psutil_bsd.c b/psutil/_psutil_bsd.c index 7b0f140e..edb790a9 100644 --- a/psutil/_psutil_bsd.c +++ b/psutil/_psutil_bsd.c @@ -984,9 +984,7 @@ PsutilMethods[] = { #endif // --- others - {"py_psutil_is_testing", py_psutil_is_testing, METH_VARARGS, - "Return True if psutil is in testing mode"}, - {"py_psutil_set_testing", py_psutil_set_testing, METH_VARARGS, + {"set_testing", psutil_set_testing, METH_NOARGS, "Set psutil in testing mode"}, {NULL, NULL, 0, NULL} diff --git a/psutil/_psutil_common.c b/psutil/_psutil_common.c index 52aee48a..970acb32 100644 --- a/psutil/_psutil_common.c +++ b/psutil/_psutil_common.c @@ -42,7 +42,7 @@ static int _psutil_testing = -1; /* * Return 1 if PSUTIL_TESTING env var is set or if testing mode was - * enabled with py_psutil_set_testing. + * enabled with psutil_set_testing. */ int psutil_testing(void) { @@ -74,7 +74,7 @@ py_psutil_is_testing(PyObject *self, PyObject *args) { * Windows has no effect. */ PyObject * -py_psutil_set_testing(PyObject *self, PyObject *args) { +psutil_set_testing(PyObject *self, PyObject *args) { _psutil_testing = 1; Py_INCREF(Py_None); return Py_None; diff --git a/psutil/_psutil_common.h b/psutil/_psutil_common.h index 09999bba..0b606698 100644 --- a/psutil/_psutil_common.h +++ b/psutil/_psutil_common.h @@ -13,7 +13,7 @@ PyObject* AccessDenied(void); PyObject* NoSuchProcess(void); int psutil_testing(void); PyObject* py_psutil_is_testing(PyObject *self, PyObject *args); -PyObject* py_psutil_set_testing(PyObject *self, PyObject *args); +PyObject* psutil_set_testing(PyObject *self, PyObject *args); #if PY_MAJOR_VERSION < 3 PyObject* PyUnicode_DecodeFSDefault(char *s); PyObject* PyUnicode_DecodeFSDefaultAndSize(char *s, Py_ssize_t size); diff --git a/psutil/_psutil_linux.c b/psutil/_psutil_linux.c index 6232fe50..254208b4 100644 --- a/psutil/_psutil_linux.c +++ b/psutil/_psutil_linux.c @@ -607,9 +607,7 @@ PsutilMethods[] = { #endif // --- others - {"py_psutil_is_testing", py_psutil_is_testing, METH_VARARGS, - "Return True if psutil is in testing mode"}, - {"py_psutil_set_testing", py_psutil_set_testing, METH_VARARGS, + {"set_testing", psutil_set_testing, METH_NOARGS, "Set psutil in testing mode"}, {NULL, NULL, 0, NULL} diff --git a/psutil/_psutil_osx.c b/psutil/_psutil_osx.c index 9908d033..93ebd849 100644 --- a/psutil/_psutil_osx.c +++ b/psutil/_psutil_osx.c @@ -1845,9 +1845,7 @@ PsutilMethods[] = { "Return CPU statistics"}, // --- others - {"py_psutil_is_testing", py_psutil_is_testing, METH_VARARGS, - "Return True if psutil is in testing mode"}, - {"py_psutil_set_testing", py_psutil_set_testing, METH_VARARGS, + {"set_testing", psutil_set_testing, METH_NOARGS, "Set psutil in testing mode"}, {NULL, NULL, 0, NULL} diff --git a/psutil/_psutil_sunos.c b/psutil/_psutil_sunos.c index 2abcd829..7b47ef1b 100644 --- a/psutil/_psutil_sunos.c +++ b/psutil/_psutil_sunos.c @@ -1592,9 +1592,7 @@ PsutilMethods[] = { "Return CPU statistics"}, // --- others - {"py_psutil_is_testing", py_psutil_is_testing, METH_VARARGS, - "Return True if psutil is in testing mode"}, - {"py_psutil_set_testing", py_psutil_set_testing, METH_VARARGS, + {"set_testing", psutil_set_testing, METH_NOARGS, "Set psutil in testing mode"}, {NULL, NULL, 0, NULL} diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c index e28c12e3..1e7b3ad4 100644 --- a/psutil/_psutil_windows.c +++ b/psutil/_psutil_windows.c @@ -3658,9 +3658,7 @@ PsutilMethods[] = { "QueryDosDevice binding"}, // --- others - {"py_psutil_is_testing", py_psutil_is_testing, METH_VARARGS, - "Return True if psutil is in testing mode"}, - {"py_psutil_set_testing", py_psutil_set_testing, METH_VARARGS, + {"set_testing", psutil_set_testing, METH_NOARGS, "Set psutil in testing mode"}, {NULL, NULL, 0, NULL} diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index 9f943d7a..d2368ae5 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -754,9 +754,9 @@ unittest.TestCase = TestCase def _setup_tests(): if 'PSUTIL_TESTING' not in os.environ: - os.environ['PSUTIL_TESTING'] = '1' # not guaranteed to work - psutil._psplatform.cext.py_psutil_set_testing() - assert psutil._psplatform.cext.py_psutil_is_testing() + # This won't work on Windows but set_testing() below will do it. + os.environ['PSUTIL_TESTING'] = '1' + psutil._psplatform.cext.set_testing() def get_suite(): |