From 0c91561cf64fd7d9d855ac25b059d80f9cf09260 Mon Sep 17 00:00:00 2001
From: smaguin <smaguin@localhost>
Date: Mon, 20 Aug 2007 14:34:12 +0000
Subject: [PATCH] fix bug
---
opends/tests/functional-tests/testcases/logging/logging_rotation.xml | 15 +++++++
opends/tests/functional-tests/testcases/logging/logging_retention.xml | 54 +++++++++++++++++++++++++++
2 files changed, 68 insertions(+), 1 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/logging/logging_retention.xml b/opends/tests/functional-tests/testcases/logging/logging_retention.xml
index ef89a04..4ef2ea6 100755
--- a/opends/tests/functional-tests/testcases/logging/logging_retention.xml
+++ b/opends/tests/functional-tests/testcases/logging/logging_retention.xml
@@ -191,7 +191,61 @@
<call function="'testIsPASS'"/>
</sequence>
</if>
+
+ <!-- cleanup -->
+ <message>'------ remove this rotation policy to the Access log publisher --' </message>
+ <call function="'dsconfig'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : 'set-log-publisher-prop' ,
+ 'objectType' : 'publisher-name' ,
+ 'objectName' : 'File-Based Access Logger',
+ 'optionsString' : '--remove rotation-policy-dn:"cn=my size Limit Rotation Policy,cn=Log Rotation Policies,cn=config"',
+ 'expectedRC' : 0 }
+ </call>
+
+ <message>'------ remove this retention policy to the Access log publisher --' </message>
+ <call function="'dsconfig'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : 'set-log-publisher-prop' ,
+ 'objectType' : 'publisher-name' ,
+ 'objectName' : 'File-Based Access Logger',
+ 'optionsString' : '--remove retention-policy-dn:"cn=my file count retention policy,cn=Log Retention Policies,cn=config"',
+ 'expectedRC' : 0 }
+ </call>
+
+
+ <message>'-- delete a new file count retention policy --'</message>
+ <call function="'dsconfig'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : 'delete-log-retention-policy' ,
+ 'objectType' : 'policy-name' ,
+ 'objectName' : 'my file count retention policy',
+ 'expectedRC' : 0 }
+ </call>
+
+
+ <message>'-- delete a new size limit rotation policy --'</message>
+ <call function="'dsconfig'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : 'delete-log-rotation-policy' ,
+ 'objectType' : 'policy-name' ,
+ 'objectName' : 'my size Limit Rotation Policy',
+ 'expectedRC' : 0 }
+ </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/logging/logging_rotation.xml b/opends/tests/functional-tests/testcases/logging/logging_rotation.xml
index b1cfabb..c7ccf34 100755
--- a/opends/tests/functional-tests/testcases/logging/logging_rotation.xml
+++ b/opends/tests/functional-tests/testcases/logging/logging_rotation.xml
@@ -250,7 +250,20 @@
'optionsString' : '--remove rotation-policy-dn:"cn=my size Limit Rotation Policy,cn=Log Rotation Policies,cn=config"',
'expectedRC' : 0 }
</call>
-
+
+
+ <message>'-- delete a new size limit rotation policy --'</message>
+ <call function="'dsconfig'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : 'delete-log-rotation-policy' ,
+ 'objectType' : 'policy-name' ,
+ 'objectName' : 'my size Limit Rotation Policy',
+ 'expectedRC' : 0 }
+ </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
--
Gitblit v1.10.0