Changeset 11819

Timestamp:

24 Sep 2014, 15:32:30 (10 years ago)

Author:

uli

Message:

Support more types of memory in env checks.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/utils

Files:

• tests/test_utils.py (modified) (1 diff)
• utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/utils/tests/test_utils.py

@@ -102 +102 @@
         utils.SYSTEM_MAX_LOAD['virt-mem'] = -100.0  # negative number
         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.0,
+        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
+        utils = self.get_cleared_util()
+        utils.SYSTEM_MAX_LOAD['phys-mem'] = 99.0    # positive number
+        assert utils.expensive_actions_allowed() == True
+        utils.SYSTEM_MAX_LOAD['phys-mem'] = -1.0    # negative number
+        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
+        utils = self.get_cleared_util()
+        utils.SYSTEM_MAX_LOAD['phys-mem'] = 0.0     # positive number
+        assert utils.expensive_actions_allowed() == False
+        utils.SYSTEM_MAX_LOAD['phys-mem'] = -100.0  # negative number
+        assert utils.expensive_actions_allowed() == False

main/waeup.kofa/trunk/src/waeup/kofa/utils/utils.py

@@ -321 +321 @@
             ('swap-mem', psutil.swap_memory),
             ('virt-mem', psutil.virtual_memory),
+            ('phys-mem', psutil.phymem_usage),
             ):
             max_val = max_values.get(key, None)