diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-01-31 18:39:30 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-01-31 18:39:30 +0100 |
commit | 033a7e9502b1764a1aa364d9a0bf28dad25aebb3 (patch) | |
tree | dbf22c8d2caebd10a344e76b15504fb8f53b27ed /test/test_psutil.py | |
parent | 75520ea96286f2c8683294ecab72298fc159be34 (diff) | |
parent | 7d5910530c13346e25a09ec6f28a2d511e0b21db (diff) | |
download | psutil-bsebi-master.tar.gz |
merge from masterbsebi-master
Diffstat (limited to 'test/test_psutil.py')
-rw-r--r-- | test/test_psutil.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test_psutil.py b/test/test_psutil.py index 356d7e87..947edcd3 100644 --- a/test/test_psutil.py +++ b/test/test_psutil.py @@ -117,7 +117,7 @@ FREEBSD = sys.platform.startswith("freebsd") OPENBSD = sys.platform.startswith("openbsd") NETBSD = sys.platform.startswith("netbsd") BSD = FREEBSD or OPENBSD or NETBSD -SUNOS = sys.platform.startswith("sunos") +SUNOS = sys.platform.startswith("sunos") or sys.platform.startswith("solaris") VALID_PROC_STATUSES = [getattr(psutil, x) for x in dir(psutil) if x.startswith('STATUS_')] # whether we're running this test suite on Travis (https://travis-ci.org/) |