From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Tue, 24 Aug 2010 14:39:19 +0000 (+0000)
Subject: Two jobs should be enough for a collection and speed up testing.
X-Git-Tag: merge_21_head_after~12
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=b9ab467c5c23a39bb8515e9ec67d819f66fc01c3;p=jra1mw.git

Two jobs should be enough for a collection and speed up testing.
---

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-wild.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-wild.sh
index ee1bd25..2d96120 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-wild.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-wild.sh
@@ -223,26 +223,11 @@ Nodes = {
 		OutputSandbox = { "std1.out", "std1.err" };
 	],
 	[
-		Executable = "launch.sh";
+		Executable = "/bin/something-that-does-not-exist-$$";
 		Arguments = "Ahoj, svete!";
 		StdOutput = "std2.out";
 		StdError = "std2.err";
 		OutputSandbox = { "std2.out", "std2.err" };
-	],
-	[
-		Executable = "launch.sh";
-		Arguments = "Ahoj, svete!";
-	],
-	[
-		Executable = "/bin/something-that-does-not-exist";
-		Arguments = "Ahoj, svete!";
-		StdOutput = "std4.out";
-		StdError = "std4.err";
-		OutputSandbox = { "std4.out", "std4.err" };
-	],
-	[
-		Executable = "launch.sh";
-		Arguments = "Ahoj, svete!";
 	]
 }
 
@@ -280,24 +265,6 @@ Nodes = {
 	[
 		Executable = "launch.sh";
 		Arguments = "Ahoj, svete!";
-		StdOutput = "std2.out";
-		StdError = "std2.err";
-		OutputSandbox = { "std2.out", "std2.err" };
-	],
-	[
-		Executable = "launch.sh";
-		Arguments = "Ahoj, svete!";
-	],
-	[
-		Executable = "launch.sh";
-		Arguments = "Ahoj, svete!";
-		StdOutput = "std4.out";
-		StdError = "std4.err";
-		OutputSandbox = { "std4.out", "std4.err" };
-	],
-	[
-		Executable = "launch.sh";
-		Arguments = "Ahoj, svete!";
 	]
 };
 
@@ -483,7 +450,7 @@ for ((i=0; i<${#job_cats[*]}; i++)); do
 	done_coll)
 		echo -en "[wild] fetching output from $jobid${lf}"
 		glite-wms-job-status -v 0 "$jobid" | $SYS_GREP '^ .*https:' | $SYS_SED 's/.*https:/https:/' > $$.subjobs.log
-		if test x"`wc -l $$.subjobs.log | $SYS_SED 's/\s*\([0-9]*\).*/\1/'`" != x"5"; then
+		if test x"`wc -l $$.subjobs.log | $SYS_SED 's/\s*\([0-9]*\).*/\1/'`" != x"2"; then
 			print_error "error, some offspring of $jobid were spawned or eaten!" && test_failed
 			fail=$TEST_ERROR
 		fi