diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-02-04 21:18:04 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-02-04 21:18:04 +0100 |
| commit | 1ea0bb3eaed4f7bc745d92e3a42c1adb5716d757 (patch) | |
| tree | 41f854a374da169398d2606fdc2b64ba6a604ac4 | |
| parent | ab4a66a6e942ba505bb5b0be6fefadeceaef6809 (diff) | |
| download | psutil-1ea0bb3eaed4f7bc745d92e3a42c1adb5716d757.tar.gz | |
remove last deprecated refs; update mem leaks test
| -rw-r--r-- | psutil/_psbsd.py | 7 | ||||
| -rw-r--r-- | psutil/_pssunos.py | 3 | ||||
| -rw-r--r-- | test/test_memory_leaks.py | 8 |
3 files changed, 6 insertions, 12 deletions
diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py index 971b2f6b..ae8b2eff 100644 --- a/psutil/_psbsd.py +++ b/psutil/_psbsd.py @@ -98,8 +98,7 @@ svmem = namedtuple( 'active', 'inactive', 'buffers', 'cached', 'shared', 'wired']) scputimes = namedtuple( 'scputimes', ['user', 'nice', 'system', 'idle', 'irq']) -pmem = namedtuple('pmem', ['rss', 'vms', 'text', 'data', 'stack']) -pextmem = namedtuple('pextmem', ['rss', 'vms', 'text', 'data', 'stack']) +pmem = namedtuple('pextmem', ['rss', 'vms', 'text', 'data', 'stack']) pmmap_grouped = namedtuple( 'pmmap_grouped', 'path rss, private, ref_count, shadow_count') pmmap_ext = namedtuple( @@ -436,10 +435,6 @@ class Process(object): return pmem(*cext.proc_memory_info(self.pid)) @wrap_exceptions - def memory_info_ex(self): - return pextmem(*cext.proc_memory_info(self.pid)) - - @wrap_exceptions def create_time(self): return cext.proc_create_time(self.pid) diff --git a/psutil/_pssunos.py b/psutil/_pssunos.py index 2e75b197..127bd71b 100644 --- a/psutil/_pssunos.py +++ b/psutil/_pssunos.py @@ -408,9 +408,6 @@ class Process(object): rss, vms = ret[1] * 1024, ret[2] * 1024 return _common.pmem(rss, vms) - # it seems Solaris uses rss and vms only - memory_info_ex = memory_info - @wrap_exceptions def status(self): code = cext.proc_basic_info(self.pid, self._procfs_path)[6] diff --git a/test/test_memory_leaks.py b/test/test_memory_leaks.py index d79d5900..20078373 100644 --- a/test/test_memory_leaks.py +++ b/test/test_memory_leaks.py @@ -229,9 +229,11 @@ class TestProcessObjectLeaks(Base): def test_memory_info(self): self.execute('memory_info') - @skip_if_linux() - def test_memory_info_ex(self): - self.execute('memory_info_ex') + # also available on Linux but it's pure python + @unittest.skipUnless(OSX or WINDOWS, + "not available on this platform") + def test_memory_addrspace_info(self): + self.execute('memory_addrspace_info') @unittest.skipUnless(POSIX, "POSIX only") @skip_if_linux() |