From ff53986f05ce7bbc7367d2131adc90a9d5e39d54 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 20 Sep 2010 06:36:08 +0000
Subject: [PATCH] LMS-1610 fix bug
SVN: 17901
---
integration-tests/common.bash | 2 +-
integration-tests/test-screening.sh | 8 +-------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/integration-tests/common.bash b/integration-tests/common.bash
index d263856db5b..107e4a2ba2c 100755
--- a/integration-tests/common.bash
+++ b/integration-tests/common.bash
@@ -326,7 +326,7 @@ function fetch_latest_artifacts_from_cruise_control {
local last_build="$HUDSON_ARTIFACTS/$proj_name/lastSuccessful/archive/_main/targets/dist"
if [ $MY_HOST_IP == $CI_HOST_IP ]; then
- local last=`ls -1 $HOME/$last_build | sort | tail -1`
+ local last=`ls -1 /localhome/ci/$last_build | sort | tail -1`
echo "Fetching artifacts for $proj_name: $last"
cp $last_build/*.zip $dest_dir
else
diff --git a/integration-tests/test-screening.sh b/integration-tests/test-screening.sh
index 6a0f8529969..37229faf0de 100755
--- a/integration-tests/test-screening.sh
+++ b/integration-tests/test-screening.sh
@@ -126,13 +126,7 @@ function test_screening_api {
assert_pattern_present api-client-log.txt 1 "Loaded feature datasets: 2"
assert_pattern_present api-client-log.txt 1 "features labels: \[cellNumber, featrue1, featrue10, featrue11, featrue12, featrue13, featrue14, featrue15, featrue16, featrue2, featrue3, featrue4, featrue5, featrue6, featrue7, featrue8, featrue9, Hit Rate, std1, std10, std11, std12, std13, std14, std15, std16, std2, std3, std4, std5, std6, std7, std8, std9\]"
assert_pattern_present api-client-log.txt 1 "Features of the first dataset: datasetCode: [0-9]*-8"
- assert_pattern_present api-client-log.txt 1 "wellPosition: \[1, 2\], values: \[48.0, 0.0051865000277757645, 2.7146999491378665E-4, 0.0026249000802636147, 8.3676
-99920199811E-4, 0.07603199779987335, 0.6520699858665466, 0.8323100209236145, 2.4511001110076904, 6.074199918657541E-4, 0
-.004476199857890606, 6.795800291001797E-4, 0.004821899812668562, 8.004099945537746E-4, 0.0032108998857438564, 6.64030027
-1101296E-4, 0.001956300111487508, 0.09523800015449524, 0.0034064999781548977, 1.3176999345887452E-4, 6.364699802361429E-
-4, 4.711899964604527E-4, 0.02412099950015545, 0.27717000246047974, 0.14854000508785248, 0.9543099999427795, 6.5120001090
-69049E-4, 0.00208020000718534, 8.392700110562146E-4, 0.0026328000240027905, 0.001057300018146634, 8.995099924504757E-4,
-5.60179993044585E-4, 3.910500090569258E-4\]"
+ assert_pattern_present api-client-log.txt 1 "wellPosition: \[1, 2\], values: \[48.0, 0.0051865000277757645,\]"
assert_pattern_present api-client-log.txt 1 "Image metadata: \[Dataset [0-9]*-9 (plate: /DEMO/PLATE3 \[20100624113759640-7\]) has \[\[DAPI, GFP\]\] channels, 9 tiles\. Images resolution: 720x468"
for imgFile in `find . -name *.png`; do
assert_pattern_present $imgFile 1 PNG
--
GitLab