[Erp5-report] r41883 gabriel - /erp5/trunk/utils/cloudooo/cloudooo/tests/testOpenOffice.py

[nobody at svn.erp5.org]

Author: gabriel
Date: Thu Dec 30 15:50:12 2010
New Revision: 41883

URL: http://svn.erp5.org?rev=41883&view=rev
Log:
clean up code and asserts

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/tests/testOpenOffice.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/tests/testOpenOffice.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/tests/testOpenOffice.py?rev=41883&r1=41882&r2=41883&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/tests/testOpenOffice.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/tests/testOpenOffice.py [utf8] Thu Dec 30 15:50:12 2010
@@ -92,18 +92,14 @@ class TestOpenOffice(cloudoooTestCase):
     openoffice will terminate the first"""
     second_openoffice = OpenOffice()
     second_openoffice.loadSettings("localhost", 4090,
-                                self.working_path,
+                                self.working_path + "_",
                                 self.virtual_display_id,
                                 self.office_binary_path,
                                 self.uno_path)
     try:
       second_openoffice.start()
-      try:
-        openoffice_process = Process(self.openoffice.pid())
-        openoffice_process.get_connections()
-        self.fail("Access get_connections() function should fails")
-      except AccessDenied:
-        self.assertTrue("Excepted failure")
+      openoffice_process = Process(self.openoffice.pid())
+      self.assertRaises(AccessDenied, openoffice_process.get_connections)
     finally:
       second_openoffice.stop()
 
@@ -116,15 +112,12 @@ class TestOpenOffice(cloudoooTestCase):
                                 self.uno_path)
     try:
       second_openoffice.start()
-      try:
-        openoffice_process = Process(self.openoffice.pid())
-        connection = openoffice_process.get_connections()[0]
-        self.assertEquals(connection.local_address[1], 4090)
-        openoffice_process = Process(second_openoffice.pid())
-        connection = openoffice_process.get_connections()[0]
-        self.assertEquals(connection.local_address[1], 4091)
-      except AccessDenied:
-        self.fail("Access get_connections() function should be allowed")
+      openoffice_process = Process(self.openoffice.pid())
+      connection = openoffice_process.get_connections()[0]
+      self.assertEquals(connection.local_address[1], 4090)
+      openoffice_process = Process(second_openoffice.pid())
+      connection = openoffice_process.get_connections()[0]
+      self.assertEquals(connection.local_address[1], 4091)
     finally:
       second_openoffice.stop()
 
@@ -147,15 +140,11 @@ class TestOpenOffice(cloudoooTestCase):
 
     try:
       third_openoffice.start()
-      try:
-        openoffice_process = Process(self.openoffice.pid())
-        connection = openoffice_process.get_connections()[0]
-        self.assertEquals(connection.local_address[1], 4090)
-        openoffice_process = Process(second_openoffice.pid())
-        openoffice_process.get_connections()
-        self.fail("Access get_connections() function should fails")
-      except AccessDenied:
-        self.assertTrue("Excepted failure")
+      openoffice_process = Process(self.openoffice.pid())
+      connection = openoffice_process.get_connections()[0]
+      self.assertEquals(connection.local_address[1], 4090)
+      openoffice_process = Process(second_openoffice.pid())
+      self.assertRaises(AccessDenied, openoffice_process.get_connections)
     finally:
       second_openoffice.stop()
       third_openoffice.stop()