Skip to content
Snippets Groups Projects
Commit 6d5b9b68 authored by felmer's avatar felmer
Browse files

DMV-13 test fixed for Unix

SVN: 6126
parent f8272138
No related branches found
No related tags found
No related merge requests found
...@@ -196,6 +196,7 @@ public class IncomingProcessorTest ...@@ -196,6 +196,7 @@ public class IncomingProcessorTest
TEST_FILE.createNewFile(); TEST_FILE.createNewFile();
dataMoverTimerTask.run(); // 4. round finds changed status, thus log dataMoverTimerTask.run(); // 4. round finds changed status, thus log
boolean terminated = OSUtilities.isWindows();
assertEquals( assertEquals(
LOG_DEBUG_PREFIX LOG_DEBUG_PREFIX
+ "Executing command: [sh, targets/unit-test/IncomingProcessorTest/example-script.sh, " + "Executing command: [sh, targets/unit-test/IncomingProcessorTest/example-script.sh, "
...@@ -203,12 +204,13 @@ public class IncomingProcessorTest ...@@ -203,12 +204,13 @@ public class IncomingProcessorTest
+ OSUtilities.LINE_SEPARATOR + OSUtilities.LINE_SEPARATOR
+ "ERROR NOTIFY.ch.systemsx.cisd.datamover.utils.DataCompletedFilter - " + "ERROR NOTIFY.ch.systemsx.cisd.datamover.utils.DataCompletedFilter - "
+ "Processing status of data completed script has changed to " + "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, " + "Command line: [sh, targets/unit-test/IncomingProcessorTest/example-script.sh, "
+ "<wd>/targets/unit-test/IncomingProcessorTest/incoming/test-data.txt]" + "<wd>/targets/unit-test/IncomingProcessorTest/incoming/test-data.txt]"
+ OSUtilities.LINE_SEPARATOR + OSUtilities.LINE_SEPARATOR
+ "WARN OPERATION.ch.systemsx.cisd.datamover.utils.DataCompletedFilter - " + "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 + OSUtilities.LINE_SEPARATOR
+ "WARN MACHINE.ch.systemsx.cisd.datamover.utils.DataCompletedFilter - " + "WARN MACHINE.ch.systemsx.cisd.datamover.utils.DataCompletedFilter - "
+ "[sh] output:" + "[sh] output:"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment