diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-04-11 11:57:25 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-04-11 11:57:25 +0200 |
| commit | 229fcd96fb69980f6db59e38c4a6752ccec3a285 (patch) | |
| tree | bde4cb8f5b83903ec72f49b02590ec9b4bc4f67e | |
| parent | ae17f987865ad57179408da4731e0c1935a354dd (diff) | |
| download | psutil-795-win-services.tar.gz | |
update doc795-win-services
| -rw-r--r-- | HISTORY.rst | 2 | ||||
| -rw-r--r-- | docs/index.rst | 2 | ||||
| -rw-r--r-- | psutil/tests/test_linux.py | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/HISTORY.rst b/HISTORY.rst index 5f5fb55c..0db6489c 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,6 +5,8 @@ Bug tracker at https://github.com/giampaolo/psutil/issues **Enhancements** +- #795: [Windows] new APIs to deal with Windows services: win_service_iter() + and win_service_get(). - #800: [Linux] psutil.virtual_memory() returns a new "shared" memory field. **Bug fixes** diff --git a/docs/index.rst b/docs/index.rst index 7cff8d46..5b3824ed 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1501,7 +1501,7 @@ Windows services .. versionadded:: 4.2.0 Availability: Windows -.. class:: WindowsService(name, display_name) +.. class:: WindowsService Represents a Windows service with the given *name*. This class is returned by :func:`win_service_iter` and :func:`win_service_get` functions and it is diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py index 5b4cf99d..617658fd 100644 --- a/psutil/tests/test_linux.py +++ b/psutil/tests/test_linux.py @@ -157,6 +157,7 @@ class TestSystemVirtualMemory(unittest.TestCase): delta=MEMORY_TOLERANCE) @retry_before_failing() + @unittest.skipIf(TRAVIS, "fails on travis") def test_shared(self): total, used, free, shared = free_physmem() self.assertAlmostEqual(shared, psutil.virtual_memory().shared, |