From 5bc0951a62a973df5a325e7189a6b1ae9776a784 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Mon, 17 Sep 2007 17:21:35 +0000
Subject: [PATCH] Fixed the functional test lib function that unconfigures an ssl connection. Previously, the ldaps connection handler was diabled and the key-manager-provider-dn and the trust-manager-provider-dn values were rest all in one dsconfig operation. Now the ldapsconnection handler is disabled in one dsconfig operation and the key-manager-provider-dn and the trust-manager-provider-dn values are reset in a separate dsconfig operation.
---
opends/tests/functional-tests/shared/functions/security.xml | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/opends/tests/functional-tests/shared/functions/security.xml b/opends/tests/functional-tests/shared/functions/security.xml
index 07206f7..ed5c9a9 100755
--- a/opends/tests/functional-tests/shared/functions/security.xml
+++ b/opends/tests/functional-tests/shared/functions/security.xml
@@ -998,7 +998,22 @@
'subcommand' : 'set-connection-handler-prop' ,
'objectType' : 'handler-name' ,
'objectName' : 'LDAPS Connection Handler',
- 'optionsString' : '--set enabled:false --reset key-manager-provider-dn --reset trust-manager-provider-dn --reset ssl-cert-nickname',
+ 'optionsString' : '--set enabled:false',
+ 'expectedRC' : 0
+ }
+ </call>
+
+ <call function="'dsconfig'">
+ { 'location' : location,
+ 'dsPath' : dsPath ,
+ 'dsInstanceHost' : dsInstanceHost,
+ 'dsInstancePort' : dsInstancePort ,
+ 'dsInstanceDn' : dsInstanceDn ,
+ 'dsInstancePswd' : dsInstancePswd ,
+ 'subcommand' : 'set-connection-handler-prop' ,
+ 'objectType' : 'handler-name' ,
+ 'objectName' : 'LDAPS Connection Handler',
+ 'optionsString' : '--reset key-manager-provider-dn --reset trust-manager-provider-dn --reset ssl-cert-nickname',
'expectedRC' : 0
}
</call>
--
Gitblit v1.10.0