From 1d2bb0afd11504ba65b6928f555fefa4c1dda2e0 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Thu, 27 Sep 2007 10:09:42 +0000
Subject: [PATCH] Fix invalid arg values passed to dsconfig function
---
opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml | 40 +++++++++----------
opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml | 7 +--
opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml | 7 +--
opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml | 7 +--
opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml | 34 ++++++++---------
opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml | 7 +--
6 files changed, 47 insertions(+), 55 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml b/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
index 486eecd..5df0371 100644
--- a/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
+++ b/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
@@ -78,31 +78,29 @@
<if expr="componentList[componentNumber][0] == 'get-local-db-index-prop'">
<call function="'dsconfig'">
- { 'location' : location ,
- 'dsPath' : dsPath ,
- 'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
- 'dsInstanceDn' : dsInstanceDn ,
- 'dsInstancePswd' : dsInstancePswd ,
- 'subcommand' : '%s' % componentList[componentNumber][0] ,
- 'objectType' : '%s' % componentList[componentNumber][1] ,
- 'objectName' : '%s' % componentList[componentNumber][2] ,
- 'optionsString' : '--backend-name userroot' ,
- 'expectedRC' : 0
+ {
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : '%s' % componentList[componentNumber][0] ,
+ 'objectType' : '%s' % componentList[componentNumber][1] ,
+ 'objectName' : '%s' % componentList[componentNumber][2] ,
+ 'optionsString' : '--backend-name userroot' ,
+ 'expectedRC' : 0
}
</call>
<else>
<call function="'dsconfig'">
- { 'location' : location ,
- 'dsPath' : dsPath ,
- 'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
- 'dsInstanceDn' : dsInstanceDn ,
- 'dsInstancePswd' : dsInstancePswd ,
- 'subcommand' : '%s' % componentList[componentNumber][0] ,
- 'objectType' : '%s' % componentList[componentNumber][1] ,
- 'objectName' : '%s' % componentList[componentNumber][2] ,
- 'expectedRC' : 0
+ {
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : '%s' % componentList[componentNumber][0] ,
+ 'objectType' : '%s' % componentList[componentNumber][1] ,
+ 'objectName' : '%s' % componentList[componentNumber][2] ,
+ 'expectedRC' : 0
}
</call>
</else>
diff --git a/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml b/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
index d7ff752..ac46c10 100644
--- a/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
+++ b/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
@@ -75,28 +75,26 @@
<if expr="componentList[componentNumber][0] == 'list-local-db-indexes'">
<call function="'dsconfig'">
- { 'location' : location ,
- 'dsPath' : dsPath ,
- 'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
- 'dsInstanceDn' : dsInstanceDn ,
- 'dsInstancePswd' : dsInstancePswd ,
- 'subcommand' : '%s' % componentList[componentNumber][0] ,
- 'objectType' : 'backend-name' ,
- 'objectName' : 'userroot' ,
- 'expectedRC' : 0
+ {
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : '%s' % componentList[componentNumber][0] ,
+ 'objectType' : 'backend-name' ,
+ 'objectName' : 'userroot' ,
+ 'expectedRC' : 0
}
</call>
<else>
<call function="'dsconfig'">
- { 'location' : location ,
- 'dsPath' : dsPath ,
- 'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
- 'dsInstanceDn' : dsInstanceDn ,
- 'dsInstancePswd' : dsInstancePswd ,
- 'subcommand' : '%s' % componentList[componentNumber][0] ,
- 'expectedRC' : 0
+ {
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : '%s' % componentList[componentNumber][0] ,
+ 'expectedRC' : 0
}
</call>
</else>
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml b/opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
index 1186af0..24165bc 100755
--- a/opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
+++ b/opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
@@ -241,12 +241,11 @@
</message>
<call function="'dsconfig'">
- { 'location' : location,
- 'dsPath' : dsPath ,
+ {
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
- 'dsInstanceDn' : dsInstanceDn ,
- 'dsInstancePswd' : dsInstancePswd ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-connection-handler-prop' ,
'objectType' : 'handler-name' ,
'objectName' : 'LDAPS Connection Handler',
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml b/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
index 6e47e7b..fb18e7e 100755
--- a/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
+++ b/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
@@ -241,12 +241,11 @@
</message>
<call function="'dsconfig'">
- { 'location' : location,
- 'dsPath' : dsPath ,
+ {
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
- 'dsInstanceDn' : dsInstanceDn ,
- 'dsInstancePswd' : dsInstancePswd ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-connection-handler-prop' ,
'objectType' : 'handler-name' ,
'objectName' : 'LDAPS Connection Handler',
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml b/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
index 10d03b2..a643ca2 100755
--- a/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
+++ b/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
@@ -235,12 +235,11 @@
</message>
<call function="'dsconfig'">
- { 'location' : location,
- 'dsPath' : dsPath ,
+ {
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
- 'dsInstanceDn' : dsInstanceDn ,
- 'dsInstancePswd' : dsInstancePswd ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-connection-handler-prop' ,
'objectType' : 'handler-name' ,
'objectName' : 'LDAPS Connection Handler',
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml b/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
index 8738868..7a77c89 100755
--- a/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
+++ b/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
@@ -129,12 +129,11 @@
</message>
<call function="'dsconfig'">
- { 'location' : location,
- 'dsPath' : dsPath ,
+ {
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : dsInstanceDn ,
- 'dsInstancePswd' : dsInstancePswd ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-connection-handler-prop' ,
'objectType' : 'handler-name' ,
'objectName' : 'LDAP Connection Handler',
--
Gitblit v1.10.0