Skip to content

Commit

Permalink
Revert reduce ejb deployment timeout to 120 sec from 480 sec change t…
Browse files Browse the repository at this point in the history
…o align with com.sun.ts.tests.ejb30.lite.stateful.timeout.common.StatefulTimeoutIF.EXTRA_WAIT_SECONDS default of 480 seconds (8 minutes) (#1036)

* Revert reduce ejb deployment timeout to 120 sec from 480 sec change to align with com.sun.ts.tests.ejb30.lite.stateful.timeout.common.StatefulTimeoutIF.EXTRA_WAIT_SECONDS default of 480 seconds (8 minutes)

This reverts commit 1057cba.

* update run_jakartaeetck.sh to use 480 for test.ejb.stateful.timeout.wait.seconds in ts.jte

Signed-off-by: Scott Marlow <smarlow@redhat.com>
  • Loading branch information
scottmarlow committed May 26, 2022
1 parent 3211926 commit 21ed5ab
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docker/run_jakartaeetck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ fi

sed -i.bak 's/^impl.deploy.timeout.multiplier=.*/impl.deploy.timeout.multiplier=240/g' ts.jte
sed -i.bak 's/^javatest.timeout.factor=.*/javatest.timeout.factor=2.0/g' ts.jte
sed -i.bak 's/^test.ejb.stateful.timeout.wait.seconds=.*/test.ejb.stateful.timeout.wait.seconds=180/g' ts.jte
sed -i.bak 's/^test.ejb.stateful.timeout.wait.seconds=.*/test.ejb.stateful.timeout.wait.seconds=480/g' ts.jte
sed -i.bak 's/^harness.log.traceflag=.*/harness.log.traceflag=false/g' ts.jte
sed -i.bak 's/^impl\.deploy\.timeout\.multiplier=240/impl\.deploy\.timeout\.multiplier=480/g' ts.jte

Expand Down
4 changes: 2 additions & 2 deletions install/jakartaee/bin/ts.jte
Original file line number Diff line number Diff line change
Expand Up @@ -1836,7 +1836,7 @@ ejb_wait=60000
# @test.ejb.stateful.timeout.wait.seconds - the minimum amount of time in seconds
# the test client waits before verifying the status of the target stateful
# bean. Its value must be an integer number. Its default value in ts.jte
# file is 120 seconds. It may be set to a smaller number (e.g., 60 seconds)
# file is 480 seconds. It may be set to a smaller number (e.g., 240 seconds)
# to speed up testing, depending on the stateful timeout implementation
# strategy in the target server.
#
Expand All @@ -1845,7 +1845,7 @@ ejb_wait=60000
# before the test completes. Usually setting javatest.timeout.factor to
# 2.0 or greater should suffice.
###############################################################################
test.ejb.stateful.timeout.wait.seconds=120
test.ejb.stateful.timeout.wait.seconds=480

###################################################################
# @log.file.location This property is used by JACC tests to create
Expand Down

0 comments on commit 21ed5ab

Please sign in to comment.