Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CP-15699: Re-enable the ExpectedResults test

Browse Source 
Also, changed the build script to skip the tests execution if a variable is defined (SKIP_TESTS)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica 2016-02-25 11:26:34 +00:00
parent 7867901e0d
commit 70187718da
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
XenAdminTests/SearchTests/ExpectedResults.cs
View File

@ -73,7 +73,6 @@ namespace XenAdminTests.SearchTests
}
[Ignore]
public void RunTest()
{
Assert.AreEqual(Search.Searches.Length, expectedResults.Count, "Wrong number of searches in results file " + resultsFileName);

14
mk/build.sh
View File

@ -111,7 +111,12 @@ production_jenkins_build()
source ${XENADMIN_DIR}/devtools/deadcheck/deadcheck.sh
source ${XENADMIN_DIR}/devtools/spellcheck/spellcheck.sh
source ${XENADMIN_DIR}/mk/xenadmin-build.sh
source ${XENADMIN_DIR}/mk/tests-checks.sh
# Skip the tests if the SKIP_TESTS variable is defined (e.g. in the Jenkins UI, add "export SKIP_TESTS=1" above the call for build script)
if [ -n "${SKIP_TESTS+x}" ]; then
echo "Tests skipped because SKIP_TESTS declared"
else
source ${XENADMIN_DIR}/mk/tests-checks.sh
fi
source ${XENADMIN_DIR}/mk/archive-push.sh
source ${XENADMIN_DIR}/mk/archive-build-artifacts.sh
}
@ -121,7 +126,12 @@ private_jenkins_build()
{
source ${XENADMIN_DIR}/devtools/spellcheck/spellcheck.sh
source ${XENADMIN_DIR}/mk/xenadmin-build.sh
source ${XENADMIN_DIR}/mk/tests-checks.sh
# Skip the tests if the SKIP_TESTS variable is defined (e.g. in the Jenkins UI, add "export SKIP_TESTS=1" above the call for build script)
if [ -n "${SKIP_TESTS+x}" ]; then
echo "Tests skipped because SKIP_TESTS declared"
else
source ${XENADMIN_DIR}/mk/tests-checks.sh
fi
source ${XENADMIN_DIR}/mk/archive-build-artifacts.sh
}