From 6d5b9b68eef1ea360b287f3091ba12b18f5f2f0b Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 19 May 2008 14:09:57 +0000
Subject: [PATCH] DMV-13 test fixed for Unix
SVN: 6126
---
.../ch/systemsx/cisd/datamover/IncomingProcessorTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/IncomingProcessorTest.java b/datamover/sourceTest/java/ch/systemsx/cisd/datamover/IncomingProcessorTest.java
index 5a8129824ea..9d209ae787a 100644
--- a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/IncomingProcessorTest.java
+++ b/datamover/sourceTest/java/ch/systemsx/cisd/datamover/IncomingProcessorTest.java
@@ -196,6 +196,7 @@ public class IncomingProcessorTest
TEST_FILE.createNewFile();
dataMoverTimerTask.run(); // 4. round finds changed status, thus log
+ boolean terminated = OSUtilities.isWindows();
assertEquals(
LOG_DEBUG_PREFIX
+ "Executing command: [sh, targets/unit-test/IncomingProcessorTest/example-script.sh, "
@@ -203,12 +204,13 @@ public class IncomingProcessorTest
+ OSUtilities.LINE_SEPARATOR
+ "ERROR NOTIFY.ch.systemsx.cisd.datamover.utils.DataCompletedFilter - "
+ "Processing status of data completed script has changed to "
- + "DataCompletedFilter.Status{ok=false,run=true,terminated=true,exitValue=1,blocked=false}. "
+ + "DataCompletedFilter.Status{ok=false,run=true,terminated=" + terminated
+ + ",exitValue=1,blocked=false}. "
+ "Command line: [sh, targets/unit-test/IncomingProcessorTest/example-script.sh, "
+ "<wd>/targets/unit-test/IncomingProcessorTest/incoming/test-data.txt]"
+ OSUtilities.LINE_SEPARATOR
+ "WARN OPERATION.ch.systemsx.cisd.datamover.utils.DataCompletedFilter - "
- + "[sh] process was destroyed."
+ + "[sh] process " + (terminated ? "was destroyed." : "returned with exits value 1.")
+ OSUtilities.LINE_SEPARATOR
+ "WARN MACHINE.ch.systemsx.cisd.datamover.utils.DataCompletedFilter - "
+ "[sh] output:"
--
GitLab