summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CREDITS10
-rw-r--r--HISTORY.rst1
-rwxr-xr-xpsutil/tests/test_process.py12
3 files changed, 17 insertions, 6 deletions
diff --git a/CREDITS b/CREDITS
index f6e2b199..e02ba7ee 100644
--- a/CREDITS
+++ b/CREDITS
@@ -44,7 +44,7 @@ Github usernames of people to CC on github when in need of help.
- wiggin15, Arnon Yaari
- alxchk, Oleksii Shevchuk
- AIX:
- - wiggin15, Arnon Yaari
+ - wiggin15, Arnon Yaari (maintainer)
Contributors
============
@@ -55,6 +55,10 @@ E: jloden@gmail.com
D: original co-author, initial design/bootstrap and occasional bug fixes
W: http://www.jayloden.com
+N: Arnon Yaari (wiggin15)
+W: https://github.com/wiggin15
+I: 517, 607, 610, 1131, 1123, 1130, 1154
+
N: Jeff Tang
W: https://github.com/mrjefftang
I: 340, 529, 616, 653, 654, 648, 641
@@ -365,10 +369,6 @@ N: maozguttman
W: https://github.com/maozguttman
I: 659
-N: Arnon Yaari (wiggin15)
-W: https://github.com/wiggin15
-I: 517, 607, 610, 1131, 1123, 1130
-
N: dasumin
W: https://github.com/dasumin
I: 541
diff --git a/HISTORY.rst b/HISTORY.rst
index 0309bbfd..12d6d184 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -10,6 +10,7 @@
- 1150_: [Windows] when a process is terminate()d now the exit code is set to
SIGTERM instead of 0. (patch by Akos Kiss)
- 1151_: python -m psutil.tests fail
+- 1154_: [AIX] psutil won't compile on AIX 6.1.0. (patch by Arnon Yaari)
5.4.0
=====
diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
index 3eeaa7c3..b1498192 100755
--- a/psutil/tests/test_process.py
+++ b/psutil/tests/test_process.py
@@ -747,9 +747,19 @@ class TestProcess(unittest.TestCase):
# Test that name(), exe() and cmdline() correctly handle programs
# with funky chars such as spaces and ")", see:
# https://github.com/giampaolo/psutil/issues/628
+
+ def rm():
+ # Try to limit occasional failures on Appveyor:
+ # https://ci.appveyor.com/project/giampaolo/psutil/build/1350/
+ # job/lbo3bkju55le850n
+ try:
+ safe_rmpath(funky_path)
+ except OSError:
+ pass
+
funky_path = TESTFN + 'foo bar )'
create_exe(funky_path)
- self.addCleanup(safe_rmpath, funky_path)
+ self.addCleanup(rm)
cmdline = [funky_path, "-c",
"import time; [time.sleep(0.01) for x in range(3000)];"
"arg1", "arg2", "", "arg3", ""]