From 2419cafcf9cf654bd298e9e38e5a72d906e3624a Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 15 Sep 2009 12:33:21 +0000
Subject: [PATCH] LMS-1165 bugs in integration tests fixed
SVN: 12598
---
integration-tests/run.sh | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/integration-tests/run.sh b/integration-tests/run.sh
index eba920019eb..065fcd7f2ae 100755
--- a/integration-tests/run.sh
+++ b/integration-tests/run.sh
@@ -723,14 +723,13 @@ function assert_correct_content {
assert_empty_in_out_folders
assert_dir_exists $DATA/out-raw/microX_200801011213_3VCP1/TIFF
assert_pattern_present $DATA/out-raw/.faulty_paths 1 ".*data/out-raw/.MARKER_is_finished_microX_200801011213_3VCP1"
- assert_pattern_present $WORK/datamover-raw/data-completed-info.txt 5 "Data complete.*3VCP[0-9]"
+ assert_pattern_present $WORK/datamover-raw/data-completed-info.txt 4 "Data complete.*3VCP[0-9]"
assert_correct_content_of_plate_3VCP1_in_store
assert_correct_content_of_invalid_plate_in_store 3VCP4
assert_correct_content_of_image_analysis_data 3VCP1 ".*-19.*3VCP1$"
assert_correct_content_of_image_analysis_data 3VCP3 ".*-21.*3VCP3$"
- assert_correct_content_of_image_analysis_data 3VCP4 ".*-22.*3VCP4$"
assert_correct_content_of_unidentified_plate_in_store UnknownPlate
- local file=`find_dataset_dir ".*-25$"`/original/nemo.exp1_MICROX-3VCP1.MICROX-3VCP3.txt
+ local file=`find_dataset_dir ".*-24$"`/original/nemo.exp1_MICROX-3VCP1.MICROX-3VCP3.txt
assert_equals_as_in_file "hello world" $file
# result set columns are
# id;experiment_code;data_store_code;code;is_placeholder;data_id_parent;is_complete;data_producer_code;production_timestamp
@@ -738,13 +737,12 @@ function assert_correct_content {
assert_correct_dataset_content_in_database 3 "3;EXP1;DSS1;20[0-9]*-19;f;;U;;"
assert_correct_dataset_content_in_database 4 "4;EXP1;DSS1;20[0-9]*-20;f;;U;;"
assert_correct_dataset_content_in_database 5 "5;EXP1;DSS1;20[0-9]*-21;f;;U;;"
- assert_correct_dataset_content_in_database 6 "6;EXP1;DSS1;20[0-9]*-22;f;;U;;"
- assert_correct_dataset_content_in_database 7 "7;EXP1;DSS1;MICROX-3VCP3;f;;F;microX;2008-01-01.*"
- assert_correct_dataset_content_in_database 8 "8;EXP1;DSS1;20[0-9]*-24;f;;U;;"
- assert_correct_dataset_content_in_database 9 "9;EXP1;DSS2;20[0-9]*-25;f;2;U;;"
- assert_correct_dataset_content_in_database 9 "9;EXP1;DSS2;20[0-9]*-25;f;7;U;;"
- assert_equals "Content of file in drop box1" "hello world" "`cat $DATA/drop-box1/nemo.exp1_MICROX-3VCP1.MICROX-3VCP3*-25.txt`"
- assert_equals "Content of file in drop box2" "hello world" "`cat $DATA/drop-box2/nemo.exp1_MICROX-3VCP1.MICROX-3VCP3*-25.txt`"
+ assert_correct_dataset_content_in_database 6 "6;EXP1;DSS1;MICROX-3VCP3;f;;F;microX;2008-01-01.*"
+ assert_correct_dataset_content_in_database 7 "7;EXP1;DSS1;20[0-9]*-23;f;;U;;"
+ assert_correct_dataset_content_in_database 8 "8;EXP1;DSS2;20[0-9]*-24;f;2;U;;"
+ assert_correct_dataset_content_in_database 8 "8;EXP1;DSS2;20[0-9]*-24;f;7;U;;"
+ assert_equals "Content of file in drop box1" "hello world" "`cat $DATA/drop-box1/nemo.exp1_MICROX-3VCP1.MICROX-3VCP3*-24.txt`"
+ assert_equals "Content of file in drop box2" "hello world" "`cat $DATA/drop-box2/nemo.exp1_MICROX-3VCP1.MICROX-3VCP3*-24.txt`"
}
function integration_tests {
--
GitLab