From 306e681b66654d3cac4bf25415164f59e3848d27 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Thu, 27 Aug 2009 10:34:20 +0000
Subject: [PATCH] functional tests backends import(-tasks)/export(-tasks) improvements
---
opends/tests/staf-tests/shared/functions/dsadm.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/dsadm.xml b/opends/tests/staf-tests/shared/functions/dsadm.xml
index fe50812..7792f1e 100755
--- a/opends/tests/staf-tests/shared/functions/dsadm.xml
+++ b/opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -863,19 +863,19 @@
if dsIncludeBranch:
for InBranch in dsIncludeBranch:
- STAFCmdParamsList.append('-b %s ' % InBranch)
+ STAFCmdParamsList.append('-b "%s" ' % InBranch)
if dsExcludeBranch:
for ExBranch in dsExcludeBranch:
- STAFCmdParamsList.append('-B %s ' % ExBranch)
+ STAFCmdParamsList.append('-B "%s" ' % ExBranch)
if dsIncludeAttribute:
for InAttr in dsIncludeAttribute:
- STAFCmdParamsList.append('-i %s ' % InAttr)
+ STAFCmdParamsList.append('-i "%s" ' % InAttr)
if dsExcludeAttribute:
for ExAttr in dsExcludeAttribute:
- STAFCmdParamsList.append('-e %s ' % ExAttr)
+ STAFCmdParamsList.append('-e "%s" ' % ExAttr)
if dsIncludeFilter:
for InFilter in dsIncludeFilter:
@@ -1396,7 +1396,9 @@
'dsInstanceDn' : mydn ,
'dsInstancePswd' : mypswd ,
'dsBaseDN' : '%s' % expectedEntry ,
- 'dsFilter' : 'objectclass=*'
+ 'dsScope' : 'base' ,
+ 'dsFilter' : 'objectclass=*',
+ 'attributes' : 'dn'
}
</call>
<call function="'checktestRC'">
@@ -1420,7 +1422,9 @@
'dsInstanceDn' : mydn ,
'dsInstancePswd' : mypswd ,
'dsBaseDN' : '%s' % missingEntry ,
+ 'dsScope' : 'base' ,
'dsFilter' : 'objectclass=*' ,
+ 'attributes' : 'dn' ,
'expectedRC' : 32
}
</call>
--
Gitblit v1.10.0