Changeset 11970

Timestamp:

16 Nov 2014, 13:21:27 (10 years ago)

Author:

uli

Message:

Reapply psutil deprecation patch from waeup.kofa.

Location:

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba

Files:

• . (modified) (1 prop)
• utils/tests/test_utils.py (modified) (2 diffs)
• utils/utils.py (modified) (2 diffs)

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/utils/tests/test_utils.py

@@ -29 +29 @@
 
     def setUp(self):
-        self.max_pmem = psutil.phymem_usage().total
         self.max_vmem = psutil.virtual_memory().total
         self.max_smem = psutil.swap_memory().total
@@ -124 +123 @@
         utils.SYSTEM_MAX_LOAD['virt-mem'] = -(sys.maxint)  # negative int
         assert utils.expensive_actions_allowed() == False
-
-    def test_expensive_actions_allowed_physmem_none(self):
-        # unset physmem maximum values make KofUtils ignore physmem values
-        utils = self.get_cleared_util()
-        utils.SYSTEM_MAX_LOAD['phys-mem'] = None
-        assert utils.expensive_actions_allowed() == True
-        # even not-set values won't block us
-        del utils.SYSTEM_MAX_LOAD['phys-mem']
-        assert utils.expensive_actions_allowed() == True
-
-    @unittest.skipIf(
-        psutil.phymem_usage().percent >= 99.99,
-        reason="System physmem use over 99%. Cannot set higher allowed value.")
-    def test_expensive_actions_allowed_physmem_ok(self):
-        # We can react to high physmem values
-        max_mem = psutil.phymem_usage().total
-        utils = self.get_cleared_util()
-        utils.SYSTEM_MAX_LOAD['phys-mem'] = 99.99          # positive float
-        assert utils.expensive_actions_allowed() == True
-        utils.SYSTEM_MAX_LOAD['phys-mem'] = -0.01          # negative float
-        assert utils.expensive_actions_allowed() == True
-        utils.SYSTEM_MAX_LOAD['phys-mem'] = max_mem        # positive int
-        assert utils.expensive_actions_allowed() == True
-        utils.SYSTEM_MAX_LOAD['phys-mem'] = -1             # negative int
-        assert utils.expensive_actions_allowed() == True
-
-    @unittest.skipIf(
-        not psutil.phymem_usage().percent,
-        reason="Can test physmem behavior only if actually using some")
-    def test_expensive_actions_allowed_physmem_too_much(self):
-        # We can react if too much physmem is used
-        max_mem = psutil.phymem_usage().total
-        utils = self.get_cleared_util()
-        utils.SYSTEM_MAX_LOAD['phys-mem'] = 0.0            # positive float
-        assert utils.expensive_actions_allowed() == False
-        utils.SYSTEM_MAX_LOAD['phys-mem'] = -100.0         # negative float
-        assert utils.expensive_actions_allowed() == False
-        utils.SYSTEM_MAX_LOAD['phys-mem'] = 0              # positive int
-        assert utils.expensive_actions_allowed() == False
-        utils.SYSTEM_MAX_LOAD['phys-mem'] = -(max_mem)     # negative int
-        assert utils.expensive_actions_allowed() == False

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/utils/utils.py

@@ -195 +195 @@
     #: value. `cpu-load`, of course, accepts float values only.
     #: `swap-mem` = Swap Memory, `virt-mem` = Virtual Memory,
-    #: `phys-mem` = Physical Memory, `cpu-load` = CPU load in percent.
+    #: `cpu-load` = CPU load in percent.
     SYSTEM_MAX_LOAD = {
         'swap-mem': None,
         'virt-mem': None,
-        'phys-mem': None,
         'cpu-load': 100.0,
         }
@@ -317 +316 @@
             ('swap-mem', psutil.swap_memory),
             ('virt-mem', psutil.virtual_memory),
-            ('phys-mem', psutil.phymem_usage),
             ):
             max_val = max_values.get(key, None)