From 6374a4461932f60e9e3ddfd865c826889ea20a7b Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Thu, 28 Feb 2013 13:59:40 +0000
Subject: [PATCH] [Opendj-473] CR-1338 Add new rebuild-index testcases for issue OPENDJ-473
---
opends/tests/staf-tests/shared/functions/utils.xml | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/utils.xml b/opends/tests/staf-tests/shared/functions/utils.xml
index ac84c0d..1702a78 100755
--- a/opends/tests/staf-tests/shared/functions/utils.xml
+++ b/opends/tests/staf-tests/shared/functions/utils.xml
@@ -24,7 +24,7 @@
! CDDL HEADER END
!
! Copyright 2007-2010 Sun Microsystems, Inc.
- ! Portions Copyright 2011-2012 ForgeRock AS.
+ ! Portions Copyright 2011-2013 ForgeRock AS.
! -->
<stax>
<function name="checkRC">
@@ -340,10 +340,23 @@
</sequence>
<else>
<sequence>
- <message log="1">
- 'Search type: %s Did not find substring, %s, in the return \
- string, %s' % (searchType, expectedString, returnString)
- </message>
+ <if expr="expectedRC == 1">
+ <sequence>
+ <!-- The string is not found as expected so don't display the output -->
+ <message log="1">
+ 'Search type: %s Did not find substring, %s, in the return \
+ string' % (searchType, expectedString)
+ </message>
+ </sequence>
+ <else>
+ <sequence>
+ <message log="1">
+ 'Search type: %s Did not find substring, %s, in the return \
+ string, %s' % (searchType, expectedString, returnString)
+ </message>
+ </sequence>
+ </else>
+ </if>
<script>
myRC = 1
myReason = 'String not found'
--
Gitblit v1.10.0