diff --git a/integration-tests/run.sh b/integration-tests/run.sh index e1728c5a675f5a179c8fbf3a83475642776bd05d..1eb9b20af46500f5593e288a66a8f901b7128a72 100755 --- a/integration-tests/run.sh +++ b/integration-tests/run.sh @@ -762,6 +762,7 @@ function assert_correct_content { assert_correct_dataset_content_in_database 14 "14;EXP1;DSS1;20[0-9]*-13;f;7;U;;" assert_correct_dataset_content_in_database 16 "16;EXP1;DSS2;20[0-9]*-15;f;;U;;" assert_equals "Content of file in drop box1" "hello world" "`cat $DATA/drop-box1/3VCP1_*-15.txt`" + assert_equals "Content of file in drop box2" "hello world" "`cat $DATA/drop-box2/3VCP1.*-15.txt`" } function integration_tests { diff --git a/integration-tests/templates/data/drop-box2/.gitignore b/integration-tests/templates/data/drop-box2/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/integration-tests/templates/datastore_server2/etc/service.properties b/integration-tests/templates/datastore_server2/etc/service.properties index 8f13c85dd388339c886efb971f11230084707453..54906525057aa3e74a8893ccb09d728ae7f64f06 100644 --- a/integration-tests/templates/datastore_server2/etc/service.properties +++ b/integration-tests/templates/datastore_server2/etc/service.properties @@ -84,7 +84,9 @@ a.type-extractor.locator-type = RELATIVE_LOCATION a.type-extractor.data-set-type = HCS_IMAGE a.storage-processor = ch.systemsx.cisd.etlserver.imsb.StorageProcessorWithDropbox -a.storage-processor.processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor +a.storage-processor.processor = ch.systemsx.cisd.etlserver.imsb.StorageProcessorWithDropbox a.storage-processor.entity-separator = ${data-set-file-name-entity-separator} a.storage-processor.dropbox-dir = ../data/drop-box1 +a.storage-processor.processor.processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor +a.storage-processor.processor.dropbox-dir = ../data/drop-box2