From 81f1d65e0ca7e4542a597db4f28e65f84dbbcd47 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 03 Aug 2009 09:29:27 +0000
Subject: [PATCH] Front port of 2.0 tests to the trunk
---
opends/tests/staf-tests/shared/functions/utils.xml | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/utils.xml b/opends/tests/staf-tests/shared/functions/utils.xml
index 3e214fa..7064349 100755
--- a/opends/tests/staf-tests/shared/functions/utils.xml
+++ b/opends/tests/staf-tests/shared/functions/utils.xml
@@ -284,7 +284,7 @@
<if expr='re.search(searchre, returnString) != None'>
<sequence>
<message log="1">
- 'SUCCESS : Found substring, %s, in the return string' \
+ 'Found substring, %s, in the return string' \
% (expectedString)
</message>
<script>
@@ -294,8 +294,8 @@
</sequence>
<else>
<sequence>
- <message log="1" level="'Error'">
- 'ERROR : Did not find substring, %s, in the return string, %s' \
+ <message log="1">
+ 'Did not find substring, %s, in the return string, %s' \
% (expectedString, returnString)
</message>
<script>
@@ -309,16 +309,26 @@
<!-- Manage expectedRC and knownIssue -->
<if expr="expectedRC != 'noCheck'">
<if expr="myRC == expectedRC">
- <tcstatus result="'pass'"/>
+ <sequence>
+ <message log="1">
+ 'SUCCESS: searchString successful'
+ </message>
+ <tcstatus result="'pass'"/>
+ </sequence>
<else>
- <if expr="knownIssue == None">
- <tcstatus result="'fail'"/>
- <else>
- <call function="'setKnownIssue'">
- { 'issueId' : knownIssue }
- </call>
- </else>
- </if>
+ <sequence>
+ <message log="1" level="'Error'">
+ 'ERROR: searchString fail'
+ </message>
+ <if expr="knownIssue == None">
+ <tcstatus result="'fail'"/>
+ <else>
+ <call function="'setKnownIssue'">
+ { 'issueId' : knownIssue }
+ </call>
+ </else>
+ </if>
+ </sequence>
</else>
</if>
</if>
--
Gitblit v1.10.0