[Erp5-report] r44079 gabriel - /erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/

[nobody at svn.erp5.org]

Author: gabriel
Date: Wed Mar  9 14:52:48 2011
New Revision: 44079

URL: http://svn.erp5.org?rev=44079&view=rev
Log:
use 400 Mb in tests, accept lower memory usage

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorMemory.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorMemory.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorMemory.py?rev=44079&r1=44078&r2=44079&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorMemory.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMonitorMemory.py [utf8] Wed Mar  9 14:52:48 2011
@@ -57,9 +57,9 @@ class TestMonitorMemory(unittest.TestCas
       self.monitor.terminate()
 
   def testMonitorWithHugeMemoryLimit(self):
-    """Test the monitor with limit of 1Gb to the OpenOffice process"""
+    """Test the monitor with limit of 400Mb to the OpenOffice process"""
     try:
-      self.monitor = MonitorMemory(openoffice, 1, 1000)
+      self.monitor = MonitorMemory(openoffice, 1, 400)
       self.monitor.start()
       sleep(6)
       self.assertTrue(openoffice.status())
@@ -80,7 +80,7 @@ class TestMonitorMemory(unittest.TestCas
   def testMonitorWithOpenOfficeStopped(self):
     """Tests if the monitor continues to run even with openoffice stopped"""
     openoffice.stop()
-    self.monitor = MonitorMemory(openoffice, 2, 1000)
+    self.monitor = MonitorMemory(openoffice, 2, 400)
     self.monitor.start()
     try:
       sleep(self.interval)
@@ -90,14 +90,14 @@ class TestMonitorMemory(unittest.TestCas
 
   def testCreateProcess(self):
     """Test if the psutil.Process is create correctly"""
-    self.monitor = MonitorMemory(openoffice, 2, 1000)
+    self.monitor = MonitorMemory(openoffice, 2, 400)
     self.monitor.create_process()
     self.assertTrue(hasattr(self.monitor, 'process'))
     self.assertEquals(type(self.monitor.process), Process)
 
   def testGetMemoryUsage(self):
     """Test memory usage"""
-    self.monitor = MonitorMemory(openoffice, 2, 1000)
+    self.monitor = MonitorMemory(openoffice, 2, 400)
     openoffice.stop()
     memory_usage_int = self.monitor.get_memory_usage()
     self.assertEquals(memory_usage_int, 0)