diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2020-07-05 12:13:51 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2020-07-05 12:13:51 +0200 |
| commit | 57775dd969ab3064d1c846075460f5e62fa4ad2a (patch) | |
| tree | 025ce2ef7bd6beee9aedda60bb562f54bac47eb6 | |
| parent | 4c8874719d912cd93b124bd2c5c939537df78103 (diff) | |
| download | psutil-57775dd969ab3064d1c846075460f5e62fa4ad2a.tar.gz | |
give CREDITS for #1768 and #1781
| -rw-r--r-- | CREDITS | 6 | ||||
| -rw-r--r-- | HISTORY.rst | 4 | ||||
| -rw-r--r-- | psutil/tests/__init__.py | 3 | ||||
| -rwxr-xr-x | psutil/tests/runner.py | 3 |
4 files changed, 11 insertions, 5 deletions
@@ -643,7 +643,7 @@ I: 1480 N: Ammar Askar W: http://ammaraskar.com/ -I: 604, 1484 +I: 604, 1484, 1781 N: agnewee W: https://github.com/Agnewee @@ -700,3 +700,7 @@ I: 1695 N: Michał Górny W: https://github.com/mgorny I: 1726 + +N: Julien Lebot +W: https://github.com/julien-lebot +I: 1768 diff --git a/HISTORY.rst b/HISTORY.rst index 3cb021a1..0963dd04 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -25,6 +25,8 @@ XXXX-XX-XX psutil.Process(pid=12739, name='python3', status='terminated', exitcode=<Negsigs.SIGTERM: -15>, started='15:08:20') - 1757_: memory leak tests are now stable. +- 1768_: [Windows] added support for Windows Nano Server. (contributed by + Julien Lebot) **Bug fixes** @@ -32,6 +34,8 @@ XXXX-XX-XX (patch by Michał Górny) - 1760_: [Linux] Process.rlimit() does not handle long long type properly. - 1766_: [macOS] NoSuchProcess may be raised instead of ZombieProcess. +- 1781_: fix signature of callback function for getloadavg(). (patch by + Ammar Askar) 5.7.0 ===== diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index 5bad53cf..a21f1fd8 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -76,7 +76,7 @@ __all__ = [ # constants 'APPVEYOR', 'DEVNULL', 'GLOBAL_TIMEOUT', 'TOLERANCE_SYS_MEM', 'NO_RETRIES', 'PYPY', 'PYTHON_EXE', 'ROOT_DIR', 'SCRIPTS_DIR', 'TESTFN_PREFIX', - 'UNICODE_SUFFIX', 'INVALID_UNICODE_SUFFIX', 'TOX', 'TRAVIS', 'CIRRUS', + 'UNICODE_SUFFIX', 'INVALID_UNICODE_SUFFIX', 'TRAVIS', 'CIRRUS', 'CI_TESTING', 'VALID_PROC_STATUSES', 'TOLERANCE_DISK_USAGE', 'IS_64BIT', "HAS_CPU_AFFINITY", "HAS_CPU_FREQ", "HAS_ENVIRON", "HAS_PROC_IO_COUNTERS", "HAS_IONICE", "HAS_MEMORY_MAPS", "HAS_PROC_CPU_NUM", "HAS_RLIMIT", @@ -117,7 +117,6 @@ __all__ = [ # --- platforms -TOX = os.getenv('TOX') or '' in ('1', 'true') PYPY = '__pypy__' in sys.builtin_module_names # whether we're running this test suite on a Continuous Integration service TRAVIS = 'TRAVIS' in os.environ diff --git a/psutil/tests/runner.py b/psutil/tests/runner.py index 8b86a3e9..0777f5e7 100755 --- a/psutil/tests/runner.py +++ b/psutil/tests/runner.py @@ -48,10 +48,9 @@ from psutil.tests import import_module_by_path from psutil.tests import print_sysinfo from psutil.tests import reap_children from psutil.tests import safe_rmpath -from psutil.tests import TOX -VERBOSITY = 1 if TOX else 2 +VERBOSITY = 2 FAILED_TESTS_FNAME = '.failed-tests.txt' NWORKERS = psutil.cpu_count() or 1 USE_COLORS = not CI_TESTING and term_supports_colors() |