From 36e9ccfca20aaf6a2c612ff06206583c2dda55c6 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Fri, 28 Mar 2008 09:38:22 +0000
Subject: [PATCH] suffix can now import ldif file

---
 opendj-sdk/opends/tests/system-tests/phases/log/topology.xml |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/opendj-sdk/opends/tests/system-tests/phases/log/topology.xml b/opendj-sdk/opends/tests/system-tests/phases/log/topology.xml
index e2f4238..9b13dbd 100644
--- a/opendj-sdk/opends/tests/system-tests/phases/log/topology.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/log/topology.xml
@@ -263,9 +263,14 @@
         topoMsg = '%s\n&lt;/topology&gt;\n' % topoMsg
         
         # SUFFIX DATA
-        suffixDataForXml = NOT_DEFINED
-        root = suffix.getTree()
-        suffixDataForXml = getSuffixDataForXML(suffix.getSuffixDn(),root)
+        # Get ldif file if specified in conf.xml
+        suffixDataForXml = suffix.getLdifFile()
+        nbOfEntries = 'unknown'
+        # if ldif file is not specified in conf.xml, get the tree data
+        if suffixDataForXml == NOT_DEFINED:
+          root = suffix.getTree()
+          suffixDataForXml = getSuffixDataForXML(suffix.getSuffixDn(),root)
+          nbOfEntries = suffix.getNbOfEntries()
       </script>
       <call function="'writeStartTag'">
       {
@@ -281,7 +286,7 @@
         'content' : '\n %s \
 &lt;numberOfEntries&gt;%s&lt;/numberOfEntries&gt;\n \
 %s \n \
-' % (topoMsg,suffix.getNbOfEntries(),suffixDataForXml)
+' % (topoMsg,nbOfEntries,suffixDataForXml)
       }
       </call>
       <call function="'writeEndTag'">

--
Gitblit v1.10.0