[tomee-tck] branch master updated: See if we can get the stateful timeout tests under the 2+ hours

[jlmonteiro]

This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git


The following commit(s) were added to refs/heads/master by this push:
     new bfe2725  See if we can get the stateful timeout tests under the 2+ 
hours
bfe2725 is described below

commit bfe27254599c7e6df106fd7bb81e6ac10b3742cb
Author: Jean-Louis Monteiro <jlmonte...@tomitribe.com>
AuthorDate: Sat Jan 30 01:08:30 2021 +0100

    See if we can get the stateful timeout tests under the 2+ hours
---
 src/test/resources/testsuite.properties                     | 4 +++-
 src/test/script/openejb/tck/commands/JavaTestCommand.groovy | 2 +-
 src/test/tomee-plume/conf/tomee.xml                         | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/test/resources/testsuite.properties 
b/src/test/resources/testsuite.properties
index 4c946b6..6b940a2 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -89,6 +89,7 @@ 
command.testExecuteEjbEmbed=com.sun.ts.lib.harness.ExecTSTestCmd \
         
-Djava.naming.factory.initial=org.apache.openejb.client.LocalInitialContextFactory
 \
         -Dopenejb.deploymentId.format={appId}/{ejbJarId}/{ejbName} \
         -Dcts.tmp=$harness.temp.directory \
+        
-Dtest.ejb.stateful.timeout.wait.seconds=${test.ejb.stateful.timeout.wait.seconds}
 \
         
-Djava.util.logging.config.file=${javaee.home}/domains/domain1/config/logging.properties
 \
         -Ddeliverable.class=${deliverable.class} \
         $testExecuteClass \
@@ -221,7 +222,8 @@ whitebox-embed-xa=java:comp/env/eis/ejb_Tsr_whitebox-xa.rar
 
 securedWebServicePort=%webcontainer.default.ssl.port%
 
-test.ejb.stateful.timeout.wait.seconds=660
+# timeout configuration is 4 minutes so we should be good
+test.ejb.stateful.timeout.wait.seconds=60
 
 harness.log.port=%harness.log.port%
 
diff --git a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy 
b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
index 546122c..3d1ed81 100644
--- a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
+++ b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
@@ -232,7 +232,7 @@ class JavaTestCommand
                 def containerJavaOpts = get('container.java.opts', "")
 
                 // force memory on tasks because with JDK 8 it's computed with 
a bit too much
-                containerJavaOpts += " -Xmx512m"
+                containerJavaOpts += " -Xmx512m 
-Dtest.ejb.stateful.timeout.wait.seconds=60"
 
 
                 if (options.contains('security')) {
diff --git a/src/test/tomee-plume/conf/tomee.xml 
b/src/test/tomee-plume/conf/tomee.xml
index 70b638e..90f45b3 100644
--- a/src/test/tomee-plume/conf/tomee.xml
+++ b/src/test/tomee-plume/conf/tomee.xml
@@ -28,7 +28,9 @@
 
   <Container id="StatefulContainer" ctype="STATEFUL">
     Passivator org.apache.openejb.core.stateful.SimplePassivater
-    TimeOut 20
+    #TimeOut 20
+    TimeOut 4
+    Frequency 10
     BulkPassivate 50
   </Container>