Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarvin Mueller2015-09-23 02:36:45 -0400
committerMarvin Mueller2015-09-23 03:51:39 -0400
commit71aafae928ef39196298ce7415cef8b389ddacdd (patch)
tree6e460a390f91062fa47a8905e48dad06b9c17846
parent68660bf960efea67a31e365bd3edbc2730d300af (diff)
downloadorg.eclipse.jubula.core-71aafae928ef39196298ce7415cef8b389ddacdd.tar.gz
org.eclipse.jubula.core-71aafae928ef39196298ce7415cef8b389ddacdd.tar.xz
org.eclipse.jubula.core-71aafae928ef39196298ce7415cef8b389ddacdd.zip
Sprint task - add further way that a timeout should not lead to no testresult written JUB-1298
-rw-r--r--org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/core/ExecutionController.java2
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java5
2 files changed, 5 insertions, 2 deletions
diff --git a/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/core/ExecutionController.java b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/core/ExecutionController.java
index 5b403d457..e2307d748 100644
--- a/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/core/ExecutionController.java
+++ b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/core/ExecutionController.java
@@ -465,6 +465,7 @@ public class ExecutionController implements IAUTServerEventListener,
*/
private void waitForReportingToFinish(long timeout) {
long endtime = System.currentTimeMillis() + timeout;
+ TimeUtil.delay(500); // wait for reporting job to start
while (ClientTest.instance().isReportingRunning()) {
TimeUtil.delay(250);
if (endtime - System.currentTimeMillis() < 0) {
@@ -910,6 +911,7 @@ public class ExecutionController implements IAUTServerEventListener,
if (exception instanceof JBException) {
String errorMsg = exception.getMessage();
sysErr(errorMsg);
+ TestExecution.getInstance().stopExecution();
stopProcessing();
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java
index 5475965a0..e6b706de1 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java
@@ -648,8 +648,9 @@ public class ClientTestImpl implements IClientTest {
*/
private boolean continueTestJobExecution(AtomicInteger testExecutionState,
AtomicInteger testExecutionMessageId) {
- if (testExecutionMessageId.get()
- == MessageIDs.E_NO_AUT_CONNECTION_ERROR.intValue()) {
+ int messageID = testExecutionMessageId.get();
+ if (messageID == MessageIDs.E_NO_AUT_CONNECTION_ERROR.intValue()
+ || messageID == MessageIDs.E_TIMEOUT_CONNECTION.intValue()) {
return false;
}
if (testExecutionState.get() == State.TEST_EXEC_STOP.ordinal()) {

Back to the top