[Libreoffice-commits] core.git: qadevOOo/runner

[Noel Grandin]

 qadevOOo/runner/helper/OfficeProvider.java |   10 ----------
 qadevOOo/runner/lib/TestParameters.java    |    1 -
 qadevOOo/runner/util/PropertyName.java     |    6 ------
 3 files changed, 17 deletions(-)

New commits:
commit fd91c0ac507ac2d565d5112b7dbd87014b142cf6
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Mar 15 08:48:49 2016 +0200

    remove the office close timeout in subsequentcheck
    
    and lets see if anyone complains
    
    Change-Id: I0ec236006476064e67cda9869ab45c1860ed351b

diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index 584c4ca..8805658 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -476,16 +476,6 @@ public class OfficeProvider implements AppProvider
 
                     desk.terminate();
                     dbg("Desktop terminated");
-
-                    try
-                    {
-                        final int closeTime = param.getInt(util.PropertyName.OFFICE_CLOSE_TIME_OUT);
-                        dbg("the Office has " + closeTime / 1000 + " seconds for closing...");
-                        Thread.sleep(closeTime);
-                    }
-                    catch (InterruptedException e)
-                    {
-                    }
                 }
             }
             catch (com.sun.star.uno.Exception ue)
diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java
index 33fbd30..d5fdf5f 100644
--- a/qadevOOo/runner/lib/TestParameters.java
+++ b/qadevOOo/runner/lib/TestParameters.java
@@ -157,7 +157,6 @@ public class TestParameters extends HashMap<String,Object> {
         put(PropertyName.TIME_OUT, Integer.valueOf(3000000));
         put(PropertyName.THREAD_TIME_OUT, Integer.valueOf(3000000));
         put(PropertyName.AUTO_RESTART, Boolean.FALSE);
-        put(PropertyName.OFFICE_CLOSE_TIME_OUT, Integer.valueOf(15000));
 
         // get the operating system
         put(PropertyName.OPERATING_SYSTEM, getSOCompatibleOSName());
diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java
index 83a0b7f..b15fc88 100644
--- a/qadevOOo/runner/util/PropertyName.java
+++ b/qadevOOo/runner/util/PropertyName.java
@@ -93,12 +93,6 @@ public interface PropertyName {
      */
     String THREAD_TIME_OUT = "ThreadTimeOut";
     /**
-     * parameter name: "OfficeCloseTimeOut"
-     * This parameter contains the time which the office could use to close for
-     * itself before it is destroyed. Default is 15000 ms
-     */
-    String OFFICE_CLOSE_TIME_OUT = "OfficeCloseTimeOut";
-    /**
      * parameter name: "OperatingSystem"
      */
     String OPERATING_SYSTEM = "OperatingSystem";