Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #174 from stephen-turner/increase-test-timeout

Browse Source 
CA-142537 Increase NUnit timeout
This commit is contained in:
Stephen Turner 2014-08-14 18:13:45 +01:00
commit 0c9d8cca51
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/tests-checks.sh
View File

@ -50,12 +50,12 @@ set +e
"/cygdrive/c/Program Files/NUnit 2.5.10/bin/net-2.0/nunit-console.exe" /process=separate /noshadow /labels /err="C:\cygwin\tmp\error.nunit.log" /timeout=40000 /output="C:\cygwin\tmp\output.nunit.log" /xml="C:\cygwin\tmp\XenAdminTests.xml" "C:\cygwin\tmp\Release\XenAdminTests.dll" "/framework=net-4.0" &
pid=$!
(sleep 2000 ; kill $pid 2>/dev/null ) &
(sleep 3000 ; kill $pid 2>/dev/null ) &
sleeperpid=$!
wait $pid
if [ $? = 143 ]
then
echo "Tests were terminated due to 2000 timeout."
echo "Tests were terminated due to 3000 timeout."
fi
set -e

2
mk/xenadmintests.sh
View File

@ -39,7 +39,7 @@ then
echo -n "Starting tests at "
date
TIMEOUT=2000
TIMEOUT=3000
VIADAEMON=./myrepos/xenadmin.hg/mk/viadaemon.py