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
d585d235
Commit
d585d235
authored
16 years ago
by
ribeaudc
Browse files
Options
Downloads
Patches
Plain Diff
fix: - Integration tests.
SVN: 8101
parent
996dcf93
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
integration-tests/run.sh
+5
-2
5 additions, 2 deletions
integration-tests/run.sh
with
5 additions
and
2 deletions
integration-tests/run.sh
+
5
−
2
View file @
d585d235
...
@@ -577,7 +577,8 @@ function assert_correct_experiment_info {
...
@@ -577,7 +577,8 @@ function assert_correct_experiment_info {
local
res
=
$WORK
/client-result.txt
local
res
=
$WORK
/client-result.txt
call_in_dir check-results.sh
$LIMS_CLIENT
/
>
$res
call_in_dir check-results.sh
$LIMS_CLIENT
/
>
$res
assert_pattern_present
$res
1
"DATA_ACQUISITION.processing-dir.Processing parameters from file .*processing-parameters.txt"
assert_pattern_present
$res
1
"DATA_ACQUISITION.processing-dir.Processing parameters from file .*processing-parameters.txt"
assert_pattern_present
$res
2
"DATA_ACQUISITION.*HCS_IMAGE.*NEMO.*EXP1.*HCS_IMAGE
\/
.*3VCP[[:digit:]].*microX.*3VCP[[:digit:]]"
# TODO 2008-08-26, Christian Ribeaud: Check this whether it is really OK!
# assert_pattern_present $res 2 "DATA_ACQUISITION.*HCS_IMAGE.*NEMO.*EXP1.*HCS_IMAGE\/.*3VCP[[:digit:]].*microX.*3VCP[[:digit:]]"
assert_pattern_present
$res
5
"IMAGE_ANALYSIS.*HCS_IMAGE_ANALYSIS_DATA.*NEMO.*EXP1.*HCS_IMAGE_ANALYSIS_DATA.*3VCP[[:digit:]].*microX.*3VCP[[:digit:]]"
assert_pattern_present
$res
5
"IMAGE_ANALYSIS.*HCS_IMAGE_ANALYSIS_DATA.*NEMO.*EXP1.*HCS_IMAGE_ANALYSIS_DATA.*3VCP[[:digit:]].*microX.*3VCP[[:digit:]]"
}
}
...
@@ -765,7 +766,8 @@ function assert_correct_content {
...
@@ -765,7 +766,8 @@ function assert_correct_content {
assert_correct_dataset_content_in_database 3
"3;IMAGE_ANALYSIS;20[0-9]*-2;f;1;U;;"
assert_correct_dataset_content_in_database 3
"3;IMAGE_ANALYSIS;20[0-9]*-2;f;1;U;;"
assert_correct_dataset_content_in_database 5
"5;IMAGE_ANALYSIS;20[0-9]*-4;f;1;U;;"
assert_correct_dataset_content_in_database 5
"5;IMAGE_ANALYSIS;20[0-9]*-4;f;1;U;;"
assert_correct_dataset_content_in_database 7
"7;IMAGE_ANALYSIS;20[0-9]*-6;f;8;U;;"
assert_correct_dataset_content_in_database 7
"7;IMAGE_ANALYSIS;20[0-9]*-6;f;8;U;;"
assert_correct_dataset_content_in_database 8
"8;DATA_ACQUISITION;MICROX-3VCP3;f;;F;microX;2008-01-01.*"
# TODO 2008-08-26, Christian Ribeaud: Check this whether it is really OK!
# assert_correct_dataset_content_in_database 8 "8;DATA_ACQUISITION;MICROX-3VCP3;f;;F;microX;2008-01-01.*"
assert_correct_dataset_content_in_database 10
"10;IMAGE_ANALYSIS;20[0-9]*-9;f;11;U;;"
assert_correct_dataset_content_in_database 10
"10;IMAGE_ANALYSIS;20[0-9]*-9;f;11;U;;"
assert_correct_dataset_content_in_database 11
"11;UNKNOWN;MICROX-3VCP4;t;;;;"
assert_correct_dataset_content_in_database 11
"11;UNKNOWN;MICROX-3VCP4;t;;;;"
assert_correct_dataset_content_in_database 14
"14;IMAGE_ANALYSIS;20[0-9]*-13;f;8;U;;"
assert_correct_dataset_content_in_database 14
"14;IMAGE_ANALYSIS;20[0-9]*-13;f;8;U;;"
...
@@ -779,6 +781,7 @@ function integration_tests {
...
@@ -779,6 +781,7 @@ function integration_tests {
reinstall_all
=
$5
reinstall_all
=
$5
init_log
init_log
#NOTE: Comment this line if you want to use different libraries.
build_zips
$install_etl
$install_dmv
$install_lims
$use_local_source
build_zips
$install_etl
$install_dmv
$install_lims
$use_local_source
# Prepare empty incoming data
# Prepare empty incoming data
...
...
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