From 8f838f7dfb94afea56a4ef5f56af8017078ab4f3 Mon Sep 17 00:00:00 2001
From: maudj <maudj@localhost>
Date: Thu, 09 Apr 2009 16:21:16 +0000
Subject: [PATCH] add check to make sure DS is started before running a restore -maudj
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml
index 1c183a2..632b8e9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
<defaultcall function="restore_db"/>
@@ -145,9 +145,9 @@
<script>
mydate=strftime("%Y%m%d%H%M%S",localtime())
- </script>
-
-
+ </script>
+
+
<call function="'restore'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
@@ -155,7 +155,7 @@
'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'startTask' : '%s' % mydate,
+ 'startTask' : '%s' % mydate,
'backupDir' : '%s/tasks/backup_schedule_asynchronous' % remote.data
}
</call>
@@ -195,6 +195,13 @@
{ 'location' : STAF_REMOTE_HOSTNAME }
</call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
+
<call function="'restore'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
--
Gitblit v1.10.0