From 1e74e0188f7fccaa13972e6a797ed05584160fe8 Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Sun, 18 Sep 2011 19:15:21 +0000
Subject: [PATCH] Ensure uniqueness of temp data folders for replication functional tests
---
opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml | 62 ++++++++++++--------
opends/tests/staf-tests/shared/python/common.py | 12 +++
opends/tests/staf-tests/shared/functions/dsadm.xml | 9 --
opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml | 39 ++++++++-----
4 files changed, 73 insertions(+), 49 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
index 7a8930a..bf8eaae 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
@@ -78,6 +78,10 @@
<testcase name="getTestCaseName('Off-line initialisation')">
<sequence>
<call function="'testCase_Preamble'"/>
+ <script>
+ m = md5_hash()
+ m.update(STAXCurrentTestcase)
+ </script>
<message>
'Replication: Binary Copy: Off-line initialisation. \
Initialise replicated servers using off-line backup/restore'
@@ -127,7 +131,8 @@
<call function="'backup'">
{ 'location' : masterHost,
'dsPath' : masterPath,
- 'backupDir' : '%s/replication/master_backup' % masterBackupDir
+ 'backupDir' : '%s/replication/master_backup_%s' \
+ % (masterBackupDir,m.hexdigest())
}
</call>
@@ -140,10 +145,10 @@
<call function="'CopyFolderByExtension'">
{ 'location' : masterHost,
'remotehost' : consumer.getHostname(),
- 'srcfolder' : '%s/replication/master_backup' \
- % masterBackupDir,
- 'destfolder' : '%s/replication/master_backup' \
- % consumerBackupDir,
+ 'srcfolder' : '%s/replication/master_backup_%s' \
+ % (masterBackupDir,m.hexdigest()),
+ 'destfolder' : '%s/replication/master_backup_%s' \
+ % (consumerBackupDir,m.hexdigest()),
'extension' : '*'
}
</call>
@@ -155,8 +160,8 @@
<call function="'restore'">
{ 'location' : consumer.getHostname(),
'dsPath' : '%s/%s' % (consumer.getDir(), OPENDSNAME),
- 'backupDir' : '%s/replication/master_backup' \
- % consumerBackupDir
+ 'backupDir' : '%s/replication/master_backup_%s' \
+ % (consumerBackupDir,m.hexdigest())
}
</call>
</sequence>
@@ -243,6 +248,10 @@
<testcase name="getTestCaseName('On-line initialisation')">
<sequence>
<call function="'testCase_Preamble'"/>
+ <script>
+ m = md5_hash()
+ m.update(STAXCurrentTestcase)
+ </script>
<message>
'Replication: Binary Copy: On-line initialisation. Initialise \
replicated servers using on-line backup/restore'
@@ -311,8 +320,8 @@
'dsInstanceDn' : master.getRootDn(),
'dsInstancePswd' : master.getRootPwd(),
'taskID' : 'backup task',
- 'backupDir' : '%s/replication/master_backup_online' \
- % masterBackupDir
+ 'backupDir' : '%s/replication/master_backup_%s' \
+ % (masterBackupDir,m.hexdigest())
}
</call>
@@ -326,10 +335,10 @@
<call function="'CopyFolderByExtension'">
{ 'location' : masterHost,
'remotehost' : consumer.getHostname(),
- 'srcfolder' : '%s/replication/master_backup_online' \
- % masterBackupDir,
- 'destfolder' : '%s/replication/master_backup_online' \
- % consumerBackupDir,
+ 'srcfolder' : '%s/replication/master_backup_%s' \
+ % (masterBackupDir,m.hexdigest()),
+ 'destfolder' : '%s/replication/master_backup_%s' \
+ % (consumerBackupDir,m.hexdigest()),
'extension' : '*'
}
</call>
@@ -346,8 +355,8 @@
'dsInstanceDn' : consumer.getRootDn(),
'dsInstancePswd' : consumer.getRootPwd(),
'taskID' : 'restore task',
- 'backupDir' : '%s/replication/master_backup_online' \
- % consumerBackupDir
+ 'backupDir' : '%s/replication/master_backup_%s' \
+ % (consumerBackupDir,m.hexdigest())
}
</call>
</sequence>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
index e553bec..7c65a60 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
@@ -99,6 +99,10 @@
<testcase name="getTestCaseName('Off-line initialisation')">
<sequence>
<call function="'testCase_Preamble'"/>
+ <script>
+ m = md5_hash()
+ m.update(STAXCurrentTestcase)
+ </script>
<message>
'Replication: Re-Synchronization: Off-line initialisation. \
Initialise replicated servers using off-line backup/restore'
@@ -112,7 +116,8 @@
<call function="'backup'">
{ 'location' : masterHost,
'dsPath' : masterPath,
- 'backupDir' : '%s/replication/master_backup' % masterBackupDir
+ 'backupDir' : '%s/replication/master_backup_%s' \
+ % (masterBackupDir,m.hexdigest())
}
</call>
@@ -147,10 +152,10 @@
<call function="'CopyFolderByExtension'">
{ 'location' : masterHost,
'remotehost' : consumer.getHostname(),
- 'srcfolder' : '%s/replication/master_backup' \
- % masterBackupDir,
- 'destfolder' : '%s/replication/master_backup' \
- % consumerBackupDir,
+ 'srcfolder' : '%s/replication/master_backup_%s' \
+ % (masterBackupDir,m.hexdigest()),
+ 'destfolder' : '%s/replication/master_backup_%s' \
+ % (consumerBackupDir,m.hexdigest()),
'extension' : '*'
}
</call>
@@ -162,8 +167,8 @@
<call function="'restore'">
{ 'location' : consumer.getHostname(),
'dsPath' : '%s/%s' % (consumer.getDir(), OPENDSNAME),
- 'backupDir' : '%s/replication/master_backup' \
- % consumerBackupDir
+ 'backupDir' : '%s/replication/master_backup_%s' \
+ % (consumerBackupDir,m.hexdigest())
}
</call>
</sequence>
@@ -203,6 +208,10 @@
<testcase name="getTestCaseName('On-line initialisation')">
<sequence>
<call function="'testCase_Preamble'"/>
+ <script>
+ m = md5_hash()
+ m.update(STAXCurrentTestcase)
+ </script>
<message>
'Replication: Re-Synchronization: On-line initialisation. \
Initialise replicated servers using on-line backup/restore'
@@ -271,8 +280,8 @@
'dsInstanceDn' : master.getRootDn(),
'dsInstancePswd' : master.getRootPwd(),
'taskID' : 'backup task - tc2',
- 'backupDir' : '%s/replication/master_backup_online' \
- % masterBackupDir
+ 'backupDir' : '%s/replication/master_backup_%s' \
+ % (masterBackupDir,m.hexdigest())
}
</call>
@@ -318,10 +327,10 @@
<call function="'CopyFolderByExtension'">
{ 'location' : masterHost,
'remotehost' : consumer.getHostname(),
- 'srcfolder' : '%s/replication/master_backup_online' \
- % masterBackupDir,
- 'destfolder' : '%s/replication/master_backup_online' \
- % consumerBackupDir,
+ 'srcfolder' : '%s/replication/master_backup_%s' \
+ % (masterBackupDir,m.hexdigest()),
+ 'destfolder' : '%s/replication/master_backup_%s' \
+ % (consumerBackupDir,m.hexdigest()),
'extension' : '*'
}
</call>
@@ -338,8 +347,8 @@
'dsInstanceDn' : consumer.getRootDn(),
'dsInstancePswd' : consumer.getRootPwd(),
'taskID' : 'restore task - tc2',
- 'backupDir' : '%s/replication/master_backup_online' \
- % consumerBackupDir
+ 'backupDir' : '%s/replication/master_backup_%s' \
+ % (consumerBackupDir,m.hexdigest())
}
</call>
</sequence>
@@ -376,6 +385,10 @@
<testcase name="getTestCaseName('Add new Server')">
<sequence>
<call function="'testCase_Preamble'"/>
+ <script>
+ m = md5_hash()
+ m.update(STAXCurrentTestcase)
+ </script>
<message>
'Replication: Re-Synchronization: Add new server. \
Initialise newly added server using on-line backup/restore'
@@ -512,8 +525,8 @@
'dsInstanceDn' : master.getRootDn(),
'dsInstancePswd' : master.getRootPwd(),
'taskID' : 'backup task - tc3',
- 'backupDir' : '%s/replication/master_backup_online' \
- % masterBackupDir
+ 'backupDir' : '%s/replication/master_backup_%s' \
+ % (masterBackupDir,m.hexdigest())
}
</call>
@@ -743,10 +756,10 @@
<call function="'CopyFolderByExtension'">
{ 'location' : masterHost,
'remotehost' : server3.getHostname(),
- 'srcfolder' : '%s/replication/master_backup_online' \
- % masterBackupDir,
- 'destfolder' : '%s/replication/master_backup_online' \
- % server3BackupDir,
+ 'srcfolder' : '%s/replication/master_backup_%s' \
+ % (masterBackupDir,m.hexdigest()),
+ 'destfolder' : '%s/replication/master_backup_%s' \
+ % (server3BackupDir,m.hexdigest()),
'extension' : '*'
}
</call>
@@ -763,8 +776,8 @@
'dsInstanceDn' : server3.getRootDn(),
'dsInstancePswd' : server3.getRootPwd(),
'taskID' : 'restore task - tc3',
- 'backupDir' : '%s/replication/master_backup_online' \
- % server3BackupDir
+ 'backupDir' : '%s/replication/master_backup_%s' \
+ % (server3BackupDir,m.hexdigest())
}
</call>
@@ -807,8 +820,7 @@
<!-- If the trees don't match, we may have come across Issue 4052
(Ghost adds in Replication Server) -->
<call function="'verifyTrees'">
- [ clientHost, clientPath, master, consumerList, synchroSuffix,
- '4052' ]
+ [ clientHost, clientPath, master, consumerList, synchroSuffix ]
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/shared/functions/dsadm.xml b/opends/tests/staf-tests/shared/functions/dsadm.xml
index cff058d..8578574 100755
--- a/opends/tests/staf-tests/shared/functions/dsadm.xml
+++ b/opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -1753,7 +1753,7 @@
</function>
<!-- Backup Task Function -->
- <function name="backupTask">
+ <function name="backupTask" scope="local">
<function-prolog>
This function performs an on line backup task
</function-prolog>
@@ -1868,12 +1868,7 @@
myLocation=location
myPath=dsPath
- try:
- import hashlib
- m = hashlib.md5()
- except ImportError:
- import md5
- m = md5.new()
+ m = md5_hash()
m.update(location)
m.update(dsPath)
taskLdifFile='backup-task-%s.ldif' % m.hexdigest()
diff --git a/opends/tests/staf-tests/shared/python/common.py b/opends/tests/staf-tests/shared/python/common.py
index 4ac4b0e..3c1c212 100644
--- a/opends/tests/staf-tests/shared/python/common.py
+++ b/opends/tests/staf-tests/shared/python/common.py
@@ -54,7 +54,8 @@
"get_last_attr_from_entry" ,
"list_matches" ,
"count_attr" ,
- "host_is_localhost"]
+ "host_is_localhost" ,
+ "md5_hash"]
class format_testcase:
'Format the Test name objects'
@@ -814,4 +815,11 @@
else:
return 0
-
+def md5_hash():
+ try:
+ import hashlib
+ m = hashlib.md5()
+ except ImportError:
+ import md5
+ m = md5.new()
+ return m
--
Gitblit v1.10.0