From e64f695c16e5d74c7fec612cd6bea9a9f4aebd85 Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Tue, 14 Aug 2007 12:47:29 +0000
Subject: [PATCH] 1. strip the lien breaks out of the ldapsearch return string 2. make the logs more readable
---
opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml
index f3700ce..65bc5de 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/indexes/indexes.xml
@@ -394,7 +394,7 @@
self.name = testName
self.filter = filter
self.rc = expectedValue
- self.isIndexed=isIndexed
+ self.isIndexed=re.compile(r'[\r\n]').sub('',isIndexed)
self.status='fail'
def getAttribute(self):
@@ -422,11 +422,11 @@
return self.status
def desc(self):
- description = 'name=[%s]' % self.name
- description += ' attribute=[%s]' % self.attribute
- description += ' filter=[%s]' % self.filter
- description += ' rc=[%s]' % self.rc
- description += ' indexed=[%s]' % self.isIndexed
+ description = 'test:: name=[%s]\n' % self.name
+ description += 'test:: attribute=[%s]\n' % self.attribute
+ description += 'test:: filter=[%s]\n' % self.filter
+ description += 'test:: rc=[%s]\n' % self.rc
+ description += 'test:: indexed=[%s]\n' % self.isIndexed
return description
indexTests = []
@@ -470,14 +470,15 @@
</call>
<script>
searchReturnCode, searchResultString = STAXResult[0]
- srs=searchResultString.split('[')
- srt=srs[1].replace('\n','').replace(' ','').replace('\r','')
-
+ # chop off the first line that contains the dn
+ searchResultString = re.compile(r'^dn:.*\n?').sub('',searchResultString)
+ # join multiple lines into a single one
+ searchResultString = re.compile(r'[ \t]*\r?\n[ \t]*').sub('',searchResultString)
+ srt=searchResultString.split('[')[1]
if (str(searchReturnCode) == str(test.getRC())) and srt.startswith(test.getSearchString()):
test.pass()
-
</script>
- <message level="'trace'">'%s searchReturnCode=[%s] srt=[%s] searchResultString=[%s] string looked for=[%s]' % (test.desc(), searchReturnCode, srt, searchResultString, test.getSearchString())</message>
+ <message level="'trace'">'%s\nsearchReturnCode=[%s]\nldapsearch return string=[%s]\nchunk to parse=[%s]\nstring looked for=[%s]' % (test.desc(), searchReturnCode, searchResultString, srt, test.getSearchString())</message>
<tcstatus result="test.getStatus()" />
<call function="'testCase_Postamble'" />
<script>
--
Gitblit v1.10.0