Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
6d5b9b68
Commit
6d5b9b68
authored
16 years ago
by
felmer
Browse files
Options
Downloads
Patches
Plain Diff
DMV-13 test fixed for Unix
SVN: 6126
parent
f8272138
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
datamover/sourceTest/java/ch/systemsx/cisd/datamover/IncomingProcessorTest.java
+4
-2
4 additions, 2 deletions
...ava/ch/systemsx/cisd/datamover/IncomingProcessorTest.java
with
4 additions
and
2 deletions
datamover/sourceTest/java/ch/systemsx/cisd/datamover/IncomingProcessorTest.java
+
4
−
2
View file @
6d5b9b68
...
@@ -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:"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment