From 5d75a3a5eb6fc8c7318457104e771e00f3bb8b30 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Wed, 05 Sep 2007 09:07:14 +0000
Subject: [PATCH] align tests for setup cli changes
---
opendj-sdk/opends/tests/functional-tests/shared/functions/topology.xml | 3 ++-
opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml | 16 ++++++++++++----
opendj-sdk/opends/tests/functional-tests/shared/functions/dsconfig.xml | 4 ++--
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
index cc3c2d5..3e73004 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
@@ -86,7 +86,13 @@
Enable as a Windows Service
</function-arg-description>
<function-arg-property name="type" value="boolean"/>
- </function-arg-def>
+ </function-arg-def>
+ <function-arg-def name="dsDoNotStart" type="optional">
+ <function-arg-description>
+ Do not start server after setup
+ </function-arg-description>
+ <function-arg-property name="type" value="boolean"/>
+ </function-arg-def>
<function-arg-def name="dsHelp" type="optional">
<function-arg-description>
Help option
@@ -104,8 +110,7 @@
if dsPath:
STAFCmd='%s/setup%s' % (dsPath,fileExt)
- STAFCmdParamsList.append('--cli')
- STAFCmdParamsList.append('-Q')
+ STAFCmdParamsList.append('-n')
if dsPort:
STAFCmdParamsList.append('-p %s' % dsPort)
@@ -127,7 +132,10 @@
if dsEnableWindowsService:
STAFCmdParamsList.append('-e')
-
+
+ if dsDoNotStart:
+ STAFCmdParamsList.append('-O')
+
if dsHelp:
STAFCmdParamsList.append('-H')
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsconfig.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsconfig.xml
index 2a1c2b5..0ee7c4d 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsconfig.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsconfig.xml
@@ -287,7 +287,7 @@
<function-arg-def name="extraParams" type="optional">
<function-arg-description>
- Optional extra parameters for specific test cases. ie -M
+ Optional extra parameters for specific test cases. ie -m
</function-arg-description>
<function-arg-property name="type" value="string" />
</function-arg-def>
@@ -2073,4 +2073,4 @@
</return>
</sequence>
</function>
-</stax>
\ No newline at end of file
+</stax>
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/topology.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/topology.xml
index 5ab126f..ee5ec82 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/topology.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/topology.xml
@@ -459,7 +459,8 @@
'dsBindDN' : dsBindDN,
'dsBindPwd' : dsBindPwd,
'dsBaseDN' : dsBaseDN,
- 'dsEnableWindowsService' : enableWindowsService
+ 'dsEnableWindowsService' : enableWindowsService,
+ 'dsDoNotStart' : 'true'
}
</call>
--
Gitblit v1.10.0