[Erp5-report] r42063 nicolas - /erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Jan  6 15:41:33 2011
New Revision: 42063

URL: http://svn.erp5.org?rev=42063&view=rev
Log:
Wrap test execution into try finally block to ensure that environment will be stopped

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

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py?rev=42063&r1=42062&r2=42063&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py [utf8] Thu Jan  6 15:41:33 2011
@@ -109,14 +109,18 @@ def run():
   elif OPENOFFICE:
     chdir(ENVIRONMENT_PATH)
     openoffice, xvfb = startFakeEnvironment(conf_path=server_cloudooo_conf)
-    run_test(test_name)
-    stopFakeEnvironment()
+    try:
+      run_test(test_name)
+    finally:
+      stopFakeEnvironment()
   elif XVFB:
     chdir(ENVIRONMENT_PATH)
     xvfb = startFakeEnvironment(start_openoffice=False,
                                 conf_path=server_cloudooo_conf)
-    run_test(test_name)
-    stopFakeEnvironment(stop_openoffice=False)
+    try:
+      run_test(test_name)
+    finally:
+      stopFakeEnvironment(stop_openoffice=False)
   else:
     chdir(ENVIRONMENT_PATH)
     loadConfig(server_cloudooo_conf)