From 4b910881daf63ec8078d712c787790e51d995608 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Tue, 18 Aug 2009 00:59:32 -0300 Subject: [PATCH] make sure get_vmvalue_from_procfs returns int --- scrapy/tests/test_utils_memory.py | 7 ++++--- scrapy/utils/memory.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scrapy/tests/test_utils_memory.py b/scrapy/tests/test_utils_memory.py index 0391c0cb9..028bff15f 100644 --- a/scrapy/tests/test_utils_memory.py +++ b/scrapy/tests/test_utils_memory.py @@ -11,9 +11,10 @@ class UtilsMemoryTestCase(unittest.TestCase): raise unittest.SkipTest('/proc filesystem not supported') vmsize = get_vmvalue_from_procfs('VmSize') vmrss = get_vmvalue_from_procfs('VmRSS') - assert vmsize > 0 - assert vmrss > 0 - assert vmsize > vmrss + self.assert_(isinstance(vmsize, int)) + self.assert_(vmsize > 0) + self.assert_(vmrss > 0) + self.assert_(vmsize > vmrss) if __name__ == "__main__": unittest.main() diff --git a/scrapy/utils/memory.py b/scrapy/utils/memory.py index 938e2d358..4e610c54e 100644 --- a/scrapy/utils/memory.py +++ b/scrapy/utils/memory.py @@ -21,5 +21,5 @@ def get_vmvalue_from_procfs(vmkey='VmSize', pid=None): if len(v) < 3: return 0 # invalid format? # convert Vm value to bytes - return float(v[1]) * _vmvalue_scale[v[2]] + return int(v[1]) * _vmvalue_scale[v[2]]