From fb3a5a7ff610bb4aa6649bb4531d99405bf0ebcf Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Tue, 27 Apr 2010 20:56:50 +0000
Subject: [PATCH] Fixing several issues with the Control Panel, the QuickSetup, Core server and Replication. Also improves unit, functional tests. More specifically this commit resolves the following open issues: 4385 - NPE when using ExtensibleMatch filter without a matching rule 4521 - dynamic lookup in attribut selection when selecting the sort order attribut while defining VLV index 4531 - Control Panel creates virtual static groups using groupOfURLs as objectclass 4533 - NullPointerException when configuring replication between 2 OpenDS 4539 - DSML Gateway - jaxb.properties Exception
---
opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
index 900a366..777587b 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2009 Sun Microsystems, Inc.
+ ! Copyright 2007-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -610,13 +610,24 @@
<if expr="expectedRC == 0 or expectedRC == 'noCheck'">
<!--- Check that DS stopped -->
- <call function="'isStopped'">
- { 'location' : location,
- 'dsPath' : dsPath,
- 'noOfLoops' : noOfLoops,
- 'noOfMilliSeconds' : noOfMilliSeconds
- }
- </call>
+ <if expr="IPS_PKG == True">
+ <call function="'isStopped'">
+ { 'location' : location,
+ 'dsPath' : '%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME),
+ 'noOfLoops' : noOfLoops,
+ 'noOfMilliSeconds' : 6000
+ }
+ </call>
+ <else>
+ <call function="'isStopped'">
+ { 'location' : location,
+ 'dsPath' : dsPath,
+ 'noOfLoops' : noOfLoops,
+ 'noOfMilliSeconds' : noOfMilliSeconds
+ }
+ </call>
+ </else>
+ </if>
</if>
</sequence>
</function>
@@ -2614,13 +2625,24 @@
<if expr="expectedRC == 0">
<!--- Check that DS stopped -->
- <call function="'isStopped'">
- { 'location' : location,
- 'dsPath' : dsPath,
- 'noOfLoops' : noOfLoops,
- 'noOfMilliSeconds' : noOfMilliSeconds
- }
- </call>
+ <if expr="IPS_PKG == True">
+ <call function="'isStopped'">
+ { 'location' : location,
+ 'dsPath' : '%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME),
+ 'noOfLoops' : noOfLoops,
+ 'noOfMilliSeconds' : noOfMilliSeconds
+ }
+ </call>
+ <else>
+ <call function="'isStopped'">
+ { 'location' : location,
+ 'dsPath' : dsPath,
+ 'noOfLoops' : noOfLoops,
+ 'noOfMilliSeconds' : noOfMilliSeconds
+ }
+ </call>
+ </else>
+ </if>
</if>
<return>STAFCmdRC</return>
@@ -4023,7 +4045,8 @@
'command' : STAFCmd,
'arguments' : STAFCmdParams,
'location' : location,
- 'expectedRC' : expectedRC
+ 'expectedRC' : expectedRC,
+ 'knownIssue' : knownIssue
}
</call>
@@ -4165,7 +4188,7 @@
'arguments' : STAFCmdParams,
'location' : location,
'expectedRC' : expectedRC,
- 'knownIssue': knownIssue
+ 'knownIssue' : knownIssue
}
</call>
--
Gitblit v1.10.0