From a659c05b345a2c83ddb87db2c8a2d7af2669b544 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Tue, 04 Dec 2007 10:14:01 +0000
Subject: [PATCH] Fix ldapsearch testcases and clu test suite cleanup.
---
opends/tests/functional-tests/testcases/clu/clu_setup.xml | 178 +++++++++++++++++++++++++++--------------------------------
1 files changed, 81 insertions(+), 97 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/clu/clu_setup.xml b/opends/tests/functional-tests/testcases/clu/clu_setup.xml
index 2c03c68..e00b889 100644
--- a/opends/tests/functional-tests/testcases/clu/clu_setup.xml
+++ b/opends/tests/functional-tests/testcases/clu/clu_setup.xml
@@ -1,77 +1,98 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "../../../shared/stax.dtd">
<!--
- ! CDDL HEADER START
- !
- ! The contents of this file are subject to the terms of the
- ! Common Development and Distribution License, Version 1.0 only
- ! (the "License"). You may not use this file except in compliance
- ! with the License.
- !
- ! You can obtain a copy of the license at
- ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
- ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- ! See the License for the specific language governing permissions
- ! and limitations under the License.
- !
- ! When distributing Covered Code, include this CDDL HEADER in each
- ! file and include the License file at
- ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
- ! Portions Copyright [yyyy] [name of copyright owner]
- !
- ! CDDL HEADER END
- !
- ! Portions Copyright 2007 Sun Microsystems, Inc.
- ! -->
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ ! Portions Copyright 2006-2007 Sun Microsystems, Inc.
+ ! -->
<stax>
<defaultcall function="clu_setup" />
<function name="clu_setup">
+
<function-description>
- Setup the command line test suite
+ Setup for the command line test suite
</function-description>
- <function-map-args>
- <function-arg-def name="startDS" type="optional" default="True">
- <function-arg-description>
- Start the Directory Server
- </function-arg-description>
- </function-arg-def>
- <function-arg-def name="loadBackend" type="optional" default="True">
- <function-arg-description>
- Load the backend with user data
- </function-arg-description>
- </function-arg-def>
- </function-map-args>
-
+
<sequence>
<block name="'setup'">
<sequence>
+ <script>
+ CurrentTestPath['group']='clu'
+ </script>
+
<!-- Create the topology necessary to the test group/suite -->
- <sequence>
+ <block name="'Block Create DS Topology'">
- <message>
- 'Create DS topology as described in config.py'
- </message>
+ <sequence>
- <call function="'createTopology'">
- { 'initialiseInstance' : False }
- </call>
+ <message>
+ 'Create DS topology as described in config.py'
+ </message>
- <call function="'checkRC'">
- { 'returncode' : RC , 'result' : STAXResult }
- </call>
+ <call function="'createTopology'">
+ { 'initialiseInstance' : False }
+ </call>
- </sequence>
+ <call function="'checkRC'">
+ {
+ 'returncode' : RC ,
+ 'result' : STAXResult
+ }
+ </call>
- <if expr="startDS == True">
-
- <!--- Start DS -->
+ </sequence>
+
+ </block>
+ <!--- End Block Create DS Topology -->
+
+ <!-- Load the data needed by the test suite -->
+ <block name="'Block DS Load Data'">
+
+ <sequence>
+
+ <message>
+ 'setup: adding Initial Entries'
+ </message>
+
+ <call function="'importLdif'">
+ {
+ 'ldifFile' : '%s/clu/data/clu_start.ldif' % logsRemoteDataDir
+ }
+ </call>
+
+ </sequence>
+
+ </block>
+ <!--- End Block DS Load Data -->
+
+ <!--- Start DS -->
+ <block name="'Block DS Process Active'">
+
<sequence>
<message>
@@ -83,58 +104,21 @@
{ 'location' : STAF_REMOTE_HOSTNAME }
</call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- </sequence>
-
- </if>
-
- <if expr="loadBackend == True">
-
- <!-- Load the data needed by the test suite -->
- <sequence>
-
- <message>
- 'Add many entries needed for Testcase 18 in cluSearch tests'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/clu/data/clu_start.ldif' % logsRemoteDataDir }
- </call>
-
- <message>'Add entries for cluSearch Tests'</message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/clu/data/ldif_mod.ldif' % logsRemoteDataDir }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+ {
+ 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000
+ }
</call>
</sequence>
- </if>
-
+ </block>
+ <!--- End Block DS Process Active -->
+
</sequence>
+
</block>
</sequence>
--
Gitblit v1.10.0