From 3169ced2d2762dc9f35aa8ca3441632166f57aea Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Fri, 02 Mar 2007 15:42:17 +0000
Subject: [PATCH] Issue 1306 make use of stax query job to get results of each test case
---
opends/tests/functional-tests/shared/functions/utils.xml | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/opends/tests/functional-tests/shared/functions/utils.xml b/opends/tests/functional-tests/shared/functions/utils.xml
index 98aaecc..254fa50 100755
--- a/opends/tests/functional-tests/shared/functions/utils.xml
+++ b/opends/tests/functional-tests/shared/functions/utils.xml
@@ -50,11 +50,11 @@
<message log="1">
'Success: RC=%s, Result=Ok' % (returncode)
</message>
- <else>
- <message log="1">
- 'Success: RC=%s, Result=%s' % (returncode,result)
- </message>
- </else>
+ <else>
+ <message log="1">
+ 'Success: RC=%s, Result=%s' % (returncode,result)
+ </message>
+ </else>
</if>
</sequence>
<else>
@@ -341,6 +341,27 @@
</function-prolog>
<function-no-args />
<sequence>
+ <call function="'queryTestcase'" />
+
+ <script>
+ if STAFResult.has_key('numPasses'):
+ numPass=int(STAFResult['numPasses'])
+ else:
+ numPass=int(0)
+
+ if STAFResult.has_key('numFails'):
+ numFail=int(STAFResult['numFails'])
+ else:
+ numFail=int(0)
+ </script>
+
+ <if expr="numFail > 0">
+ <message>'## Test Verdict: FAIL ##'</message>
+ <else>
+ <message>'## Test Verdict: PASS ##'</message>
+ </else>
+ </if>
+
<call function="'testCase_EndBanner'" />
</sequence>
</function>
@@ -370,7 +391,7 @@
</script>
<message>
- '### %s/%s suite preamble ###' % (ThisGroupName,ThisSuiteName)
+ '#### %s/%s suite preamble ####' % (ThisGroupName,ThisSuiteName)
</message>
</sequence>
@@ -397,7 +418,7 @@
</script>
<message>
- '### %s/%s suite postamble ###' % (ThisGroupName,ThisSuiteName)
+ '#### %s/%s suite postamble ####' % (ThisGroupName,ThisSuiteName)
</message>
<!-- Start time of test suite -->
@@ -444,7 +465,7 @@
ThisGroupName=CurrentTestPath['group']
</script>
- <message>'### %s group preamble ###' % ThisGroupName</message>
+ <message>'##### %s group preamble #####' % ThisGroupName</message>
</sequence>
</function>
@@ -463,7 +484,7 @@
ThisGroupName='unknown-group'
</script>
- <message>'### %s group postamble ###' % ThisGroupName</message>
+ <message>'##### %s group postamble #####' % ThisGroupName</message>
<script>
if CurrentTestPath.has_key('group'):
@@ -541,7 +562,6 @@
testlogfh=open(logfile,'w')
</script>
- <message>'Writing query result'</message>
<iterate var="element" in="queryresult">
<script>
level=element['level']
--
Gitblit v1.10.0