[Erp5-report] r42231 gabriel - in /erp5/trunk/utils/cloudooo/cloudooo/handler/ooo: applicat...

[nobody at svn.erp5.org]

Author: gabriel
Date: Tue Jan 11 18:35:26 2011
New Revision: 42231

URL: http://svn.erp5.org?rev=42231&view=rev
Log:
fix asserts. When openoffice is stopped, pid() should returns None

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/application.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/application.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/application.py?rev=42231&r1=42230&r2=42231&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/application.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/application.py [utf8] Tue Jan 11 18:35:26 2011
@@ -58,6 +58,7 @@ class Application(object):
       finally:
         if pid_exists(process_pid) or self.status():
           Process(process_pid).kill()
+      delattr(self, "process")
 
   def loadSettings(self, hostname, port, path_run_dir, display_id, **kwargs):
     """Define attributes for application instance

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py?rev=42231&r1=42230&r2=42231&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py [utf8] Tue Jan 11 18:35:26 2011
@@ -57,7 +57,7 @@ class TestOpenOffice(CloudoooTestCase):
     """Test pid function to validate if the return is correctly"""
     self.assertNotEquals(self.openoffice.pid(), None)
     self.openoffice.stop()
-    self.assertNotEquals(self.openoffice.pid(), None)
+    self.assertEquals(self.openoffice.pid(), None)
     self.assertEquals(self.openoffice.status(), False)
 
   def testOpenOfficeStart(self):
@@ -106,7 +106,7 @@ class TestOpenOffice(CloudoooTestCase):
     self.openoffice.start()
     second_openoffice = OpenOffice()
     second_openoffice.loadSettings("localhost", 4091,
-                                self.working_path + "_",
+                                self.working_path,
                                 self.virtual_display_id,
                                 self.office_binary_path,
                                 self.uno_path,

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py?rev=42231&r1=42230&r2=42231&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py [utf8] Tue Jan 11 18:35:26 2011
@@ -26,10 +26,8 @@
 #
 ##############################################################################
 
-import unittest
 from cloudoooTestCase import CloudoooTestCase, make_suite
 from cloudooo.handler.ooo.application.xvfb import Xvfb
-from cloudooo.handler.ooo.utils.utils import waitStopDaemon
 
 
 class TestXvfb(CloudoooTestCase):
@@ -50,7 +48,7 @@ class TestXvfb(CloudoooTestCase):
     self.assertNotEquals(self.xvfb.pid(), None)
     self.assertTrue(self.xvfb.status())
     self.xvfb.stop()
-    self.assertNotEquals(self.xvfb.pid(), None)
+    self.assertEquals(self.xvfb.pid(), None)
     self.assertEquals(self.xvfb.status(), False)
 
   def testStatus(self):
@@ -61,7 +59,6 @@ class TestXvfb(CloudoooTestCase):
       self.assertTrue(self.xvfb.status())
     finally:
       self.xvfb.stop()
-      waitStopDaemon(self.xvfb)
     self.assertFalse(self.xvfb.status())