summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-10-20 12:41:10 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2017-10-20 12:41:10 +0200
commit88740189e0d846df8163fd172f4b4e34f7981e22 (patch)
tree861761c22452e9f3370d6584fa0bc48ed2b3cc61
parent5444c5b548650d6c3550fca2cfb324109b8fa4aa (diff)
downloadpsutil-1151-PSUTIL_TESTING_env_var.tar.gz
-rwxr-xr-x.ci/travis/run.sh2
-rwxr-xr-xpsutil/tests/test_posix.py3
-rwxr-xr-xscripts/internal/winmake.py2
3 files changed, 5 insertions, 2 deletions
diff --git a/.ci/travis/run.sh b/.ci/travis/run.sh
index b27e6695..1501387a 100755
--- a/.ci/travis/run.sh
+++ b/.ci/travis/run.sh
@@ -30,6 +30,6 @@ if [ "$PYVER" == "2.7" ] || [ "$PYVER" == "3.6" ]; then
PSUTIL_TESTING=1 python -Wa psutil/tests/test_memory_leaks.py
# run linter (on Linux only)
if [[ "$(uname -s)" != 'Darwin' ]]; then
- python -Wa -m flake8
+ python -m flake8
fi
fi
diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py
index d1f9e54a..aaeef747 100755
--- a/psutil/tests/test_posix.py
+++ b/psutil/tests/test_posix.py
@@ -69,18 +69,21 @@ def ps(cmd):
# to get the cmdline (with args) we have to use "args" on AIX and
# Solaris, and can use "command" on all others.
+
def ps_name(pid):
field = "command"
if SUNOS:
field = "comm"
return ps("ps --no-headers -o %s -p %s" % (field, pid)).split(' ')[0]
+
def ps_args(pid):
field = "command"
if AIX or SUNOS:
field = "args"
return ps("ps --no-headers -o %s -p %s" % (field, pid))
+
@unittest.skipIf(not POSIX, "POSIX only")
class TestProcess(unittest.TestCase):
"""Compare psutil results against 'ps' command line utility (mainly)."""
diff --git a/scripts/internal/winmake.py b/scripts/internal/winmake.py
index 185db7ee..5b2bea98 100755
--- a/scripts/internal/winmake.py
+++ b/scripts/internal/winmake.py
@@ -321,7 +321,7 @@ def flake8():
py_files = py_files.decode()
py_files = [x for x in py_files.split() if x.endswith('.py')]
py_files = ' '.join(py_files)
- sh("%s -Wa -m flake8 %s" % (PYTHON, py_files), nolog=True)
+ sh("%s -m flake8 %s" % (PYTHON, py_files), nolog=True)
@cmd