Sisyphus/JavaScript Tests - lower timeout to 2 minutes, bug 417932, not part of the build

git-svn-id: svn://10.0.0.236/trunk@245833 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bclary%bclary.com 2008-02-16 16:43:07 +00:00
parent d278c99de3
commit 30a96f51f5
4 changed files with 40 additions and 29 deletions

View File

@ -274,9 +274,13 @@ while ($file = shift @ARGV)
# may be in 'completed test' for delayed browser only tests.
die "FATAL ERROR: jstest not in test: test state: $test_state: $_, log: $file"
if ('running test, reporting test, completed test' !~ /$test_state/);
if ('running test, reporting test, completed test, finished test' !~ /$test_state/);
$test_state = 'reporting test';
if ($test_state ne 'finished test')
{
# once the test is finished, don't change state here.
$test_state = 'reporting test';
}
($tmp_test_id) = $_ =~ /^jstest: (.*?) *bug:/;
($test_result) = $_ =~ /result: (.*?) *type:/;
($tmp_test_type) = $_ =~ /type: (.*?) *description:/;

File diff suppressed because one or more lines are too long

View File

@ -67,8 +67,8 @@ fi
source ${TEST_BIN}/library.sh
TEST_JSEACH_TIMEOUT=${TEST_JSEACH_TIMEOUT:-900}
TEST_JSEACH_PAGE_TIMEOUT=${TEST_JSEACH_PAGE_TIMEOUT:-840}
TEST_JSEACH_TIMEOUT=${TEST_JSEACH_TIMEOUT:-125}
TEST_JSEACH_PAGE_TIMEOUT=${TEST_JSEACH_PAGE_TIMEOUT:-120}
TEST_JSALL_TIMEOUT=${TEST_JSALL_TIMEOUT:-18000}
TEST_WWW_JS=`echo $TEST_JSDIR|sed "s|$TEST_DIR||"`

View File

@ -68,7 +68,7 @@ fi
source ${TEST_BIN}/library.sh
TEST_JSSHELL_TIMEOUT=${TEST_JSSHELL_TIMEOUT:-900}
TEST_JSSHELL_TIMEOUT=${TEST_JSSHELL_TIMEOUT:-120}
#
# options processing