Index: /main/waeup.kofa/trunk/src/waeup/kofa/utils/tests/test_utils.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/utils/tests/test_utils.py	(revision 11816)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/utils/tests/test_utils.py	(revision 11817)
@@ -71,2 +71,33 @@
         utils.SYSTEM_MAX_LOAD['swap-mem'] = -100.0  # negative number
         assert utils.expensive_actions_allowed() == False
+
+    def test_expensive_actions_allowed_virtmem_none(self):
+        # unset virtmem maximum values make KofUtils ignore virtmem values
+        utils = self.get_cleared_util()
+        utils.SYSTEM_MAX_LOAD['virt-mem'] = None
+        assert utils.expensive_actions_allowed() == True
+        # even not-set values won't block us
+        del utils.SYSTEM_MAX_LOAD['virt-mem']
+        assert utils.expensive_actions_allowed() == True
+
+    @unittest.skipIf(
+        psutil.virtual_memory().percent >= 99.0,
+        reason="System virtmem use over 99%. Cannot set higher allowed value.")
+    def test_expensive_actions_allowed_virtmem_ok(self):
+        # We can react to high virtmem values
+        utils = self.get_cleared_util()
+        utils.SYSTEM_MAX_LOAD['virt-mem'] = 99.0    # positive number
+        assert utils.expensive_actions_allowed() == True
+        utils.SYSTEM_MAX_LOAD['virt-mem'] = -1.0    # negative number
+        assert utils.expensive_actions_allowed() == True
+
+    @unittest.skipIf(
+        not psutil.virtual_memory().percent,
+        reason="Can test virtmem behavior only if actually using some")
+    def test_expensive_actions_allowed_virtmem_too_much(self):
+        # We can react if too much virtmem is used
+        utils = self.get_cleared_util()
+        utils.SYSTEM_MAX_LOAD['virt-mem'] = 0.0     # positive number
+        assert utils.expensive_actions_allowed() == False
+        utils.SYSTEM_MAX_LOAD['virt-mem'] = -100.0  # negative number
+        assert utils.expensive_actions_allowed() == False
