From 497810b785e8a05a78873b5fdfc9d536c491cc55 Mon Sep 17 00:00:00 2001
From: maudj <maudj@localhost>
Date: Tue, 07 Apr 2009 16:44:51 +0000
Subject: [PATCH] added the known issue 3909 which is about addressing correcly the fix for issue 3528 - maudj
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml | 49 +++++-------
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml | 23 ++---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml | 35 ++++----
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml | 102 ++++++++++++-------------
4 files changed, 98 insertions(+), 111 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
index 9c43915..35d6148 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
<defaultcall function="backup_db"/>
@@ -333,22 +333,16 @@
'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
-
- <message>'--- Check log files backup_schedule_asynchronous ---'</message>
- <call function="'listFolder'">
- { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % remote.data,
- 'filename' : 'backup_schedule_asynchronous'
- }
- </call>
-
- <!-- check the export ldif file has been created-->
- <if expr="len(cmdResult) == 0">
- <call function="'testFailed'"/>
- <else>
- <call function="'testPassed'"/>
- </else>
- </if>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+
+ <call function="'searchString'">
+ { 'expectedString' : 'The specified start time \'20061212000000\' has already passed' ,
+ 'returnString' : returnString ,
+ 'knownIssue' : '3909' ,
+ 'expectedRC' : '1' }
+ </call>
<call function="'testCase_Postamble'"/>
@@ -385,6 +379,13 @@
{ 'location' : STAF_REMOTE_HOSTNAME }
</call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
+
<!-- manage-tasks -->
<call function="'manage-tasks'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
index f1ce74b..020d147 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
<defaultcall function="export-ldif"/>
@@ -75,31 +75,44 @@
'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
- <!-- manage-tasks -->
- <call function="'manage-tasks'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'dsQuiet' : ' '
- }
- </call>
+ <script>checkRC=9999</script>
+ <loop from="1" to="10" var="loop" while="checkRC != 0">
+ <sequence>
+ <message>'LOOP %s' % loop</message>
+ <!-- manage-tasks -->
+ <call function="'manage-tasks'">
+ {'location' : STAF_REMOTE_HOSTNAME,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsQuiet' : ' '
+ }
+ </call>
- <script>
- returnString = STAXResult[0][1]
- </script>
-
- <call function="'searchStringForSubstring'">
- { 'returnString' : returnString,
- 'testString' : 'Completed successfully',
- 'expectedResult' : '1' }
- </call>
+ <script>
+ returnString = STAXResult[0][1]
+ currentDate=strftime("%Y%m%d",localtime())
+ </script>
+
+ <call function="'searchString'">
+ { 'expectedString' : '%s.* Export Completed successfully' \
+ % currentDate,
+ 'returnString' : returnString ,
+ 'expectedRC' : 'noCheck' }
+ </call>
+
+ <script>
+ checkRC = STAXResult[0]
+ </script>
+
+ </sequence>
+ </loop>
<message>'--- Check log files export_asynchronous ---'</message>
<call function="'listFolder'">
{ 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
'foldername' : '%s/tasks' % remote.data,
- 'filename' : 'export_asynchronous'
+ 'filename' : 'export_asynchronous'
}
</call>
@@ -211,42 +224,18 @@
'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
- <!-- manage-tasks -->
- <call function="'manage-tasks'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'dsQuiet' : ' '
- }
- </call>
-
<script>
returnString = STAXResult[0][1]
</script>
-
- <call function="'searchStringForSubstring'">
- { 'returnString' : returnString,
- 'testString' : 'Completed successfully',
- 'expectedResult' : '1' }
- </call>
-
- <message>'--- Check log files export_asynchronous ---'</message>
- <call function="'listFolder'">
- { 'location' : '%s' % (STAF_REMOTE_HOSTNAME),
- 'foldername' : '%s/tasks' % remote.data,
- 'filename' : 'export_schedule_asynchronous'
- }
- </call>
-
- <!-- check the export ldif file has been created-->
- <if expr="len(cmdResult) == 0">
- <call function="'testFailed'"/>
- <else>
- <call function="'testPassed'"/>
- </else>
- </if>
-
+
+ <call function="'searchString'">
+ { 'expectedString' : 'The specified start time \'20061212000000\' has already passed' ,
+ 'returnString' : returnString ,
+ 'knownIssue' : '3909' ,
+ 'expectedRC' : '1' }
+ </call>
+
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -280,6 +269,13 @@
{ 'location' : STAF_REMOTE_HOSTNAME }
</call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
+
<call function="'exportLdif'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
index 3a623e0..74defe8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
<defaultcall function="import-ldif"/>
@@ -214,34 +214,18 @@
'startTask' : '20061212000000',
'dsBackEnd' : DIRECTORY_INSTANCE_BE}
</call>
- <call function="'Sleep'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'sleepForMilliSeconds' : 40000 }
- </call>
-
- <!-- Check data are imported -->
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,dc=example,dc=com',
- 'uid=tmorris, dc=example,dc=com'],
- 'startDS' : 'False'
- }
- </call>
-
- <!-- Delete entries -->
- <call function="'DeleteEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'uid=scarter,dc=example,dc=com' }
- </call>
- <call function="'DeleteEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'uid=tmorris,dc=example,dc=com' }
- </call>
+
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+
+ <call function="'searchString'">
+ { 'expectedString' : 'The specified start time \'20061212000000\' has already passed' ,
+ 'returnString' : returnString ,
+ 'knownIssue' : '3909' ,
+ 'expectedRC' : '1' }
+ </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -276,6 +260,13 @@
{ 'location' : STAF_REMOTE_HOSTNAME }
</call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
+
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
index e64bc6f..60e027a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
<defaultcall function="restart_db"/>
@@ -70,16 +70,12 @@
'dsBindDN' : DIRECTORY_INSTANCE_DN,
'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
'dsRestart' : ' ',
- 'dsStopTime' : '20061212000000' }
+ 'dsStopTime' : '20061212000000',
+ 'knownIssue' : '3909' ,
+ 'expectedRC' : '89'
+ }
</call>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 10 ,
- 'noOfMilliSeconds' : 2000
- }
- </call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -107,9 +103,12 @@
'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsBindDN' : DIRECTORY_INSTANCE_DN,
'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
- 'dsStopTime' : '20061212000000' }
+ 'dsStopTime' : '20061212000000',
+ 'knownIssue' : '3909' ,
+ 'expectedRC' : '89'
+ }
</call>
-
+
<call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
--
Gitblit v1.10.0