From 6edd12a189c0c6036980818d895c8e8cc6fd2e6b Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Mon, 12 Mar 2012 12:12:18 +0000
Subject: [PATCH] Re-write of password policy functional tests part 2
---
opends/tests/staf-tests/shared/functions/ldap.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/ldap.xml b/opends/tests/staf-tests/shared/functions/ldap.xml
index 2c1ebc6..0be0f76 100755
--- a/opends/tests/staf-tests/shared/functions/ldap.xml
+++ b/opends/tests/staf-tests/shared/functions/ldap.xml
@@ -24,7 +24,7 @@
! CDDL HEADER END
!
! Copyright 2007-2010 Sun Microsystems, Inc.
- ! Portions Copyright 2011 ForgeRock AS.
+ ! Portions Copyright 2012 ForgeRock AS.
! -->
<stax>
<function name="addEntry">
@@ -1387,7 +1387,7 @@
</sequence>
</function>
-
+<!-- TO BE DEPRECATED -->
<function name="AnonSearchObject">
<function-prolog>
This function searches the Directory Server anonymously with optional arguments possible
@@ -1449,10 +1449,15 @@
</function-arg-def>
</function-map-args>
<sequence>
+ <script>
+ if dsPath:
+ dsBinPath='%s/%s' % (dsPath,fileFolder)
+ STAFCmd='%s/ldapsearch%s' % (dsBinPath,fileExt)
+ </script>
<call function="'runCommand'" >
{ 'name' : 'Anonymous Search Base Object',
'location' : location,
- 'command' : '%s/ldapsearch%s' % (dsBinPath,fileExt),
+ 'command' : STAFCmd,
'arguments' : '-h %s -p %s %s -b "%s" "%s"' % (dsInstanceHost,dsInstancePort,extraParams,dsBaseDN,dsFilter),
'expectedRC': expectedRC,
'knownIssue': knownIssue
--
Gitblit v1.10.0