From c8e9cfe662267840115923eb973324b89f322c2d Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Fri, 30 Mar 2012 10:00:01 +0000
Subject: [PATCH] Make sure server3 is shutdown in replication resync functional tests
---
opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml | 6 ++++--
opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml | 32 ++++++++++++++++----------------
2 files changed, 20 insertions(+), 18 deletions(-)
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 615562d..b93735c 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
@@ -86,8 +86,10 @@
msg1 = 'Replication: Resync:'
server3 = _topologyServerList[2]
- _topologyServerList.remove(server3)
- consumerList.remove(server3)
+ resyncServerList = _topologyServerList[:]
+ resyncServerList.remove(server3)
+ resyncConsumerList = consumerList[:]
+ resyncConsumerList.remove(server3)
</script>
<!-- List of Test Cases -->
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml
index 1cf7fcb..eab2110 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml
@@ -150,11 +150,11 @@
<!-- Stop the "consumer" servers -->
<call function="'stopServers'">
- [consumerList]
+ [resyncConsumerList]
</call>
<!-- Copy master backup to "consumer" servers and restore it -->
- <paralleliterate var="consumer" in="consumerList">
+ <paralleliterate var="consumer" in="resyncConsumerList">
<sequence>
<script>
consumerBackupDir = '%s' % consumer.getTmpDir()
@@ -186,13 +186,13 @@
<!-- Start the "consumer" servers -->
<call function="'startServers'">
- [consumerList]
+ [resyncConsumerList]
</call>
<!-- Verify the synchronization of the trees among the servers in
the topology -->
<call function="'verifyTrees'">
- [ clientHost, clientPath, master, consumerList, synchroSuffix ]
+ [ clientHost, clientPath, master, resyncConsumerList, synchroSuffix ]
</call>
</sequence>
@@ -352,7 +352,7 @@
</call>
<!-- Copy backup to "consumer" servers and restore it -->
- <paralleliterate var="consumer" in="consumerList">
+ <paralleliterate var="consumer" in="resyncConsumerList">
<sequence>
<script>
consumerBackupDir = '%s' % consumer.getTmpDir()
@@ -390,7 +390,7 @@
<!-- Verify the synchronization of the trees among the servers in
the topology -->
<call function="'verifyTrees'">
- [ clientHost, clientPath, master, consumerList, synchroSuffix ]
+ [ clientHost, clientPath, master, resyncConsumerList, synchroSuffix ]
</call>
</sequence>
@@ -450,7 +450,7 @@
</script>
<paralleliterate var="server"
- in="_topologyServerList"
+ in="resyncServerList"
indexvar="i">
<sequence>
<script>
@@ -501,7 +501,7 @@
</call>
<paralleliterate var="server"
- in="_topologyServerList"
+ in="resyncServerList"
indexvar="i">
<sequence>
<script>
@@ -586,7 +586,7 @@
</call>
<paralleliterate var="server"
- in="_topologyServerList"
+ in="resyncServerList"
indexvar="i">
<sequence>
<script>
@@ -634,7 +634,7 @@
</call>
<paralleliterate var="server"
- in="_topologyServerList"
+ in="resyncServerList"
indexvar="i">
<sequence>
<script>
@@ -685,7 +685,7 @@
</call>
<paralleliterate var="server"
- in="_topologyServerList"
+ in="resyncServerList"
indexvar="i">
<sequence>
<script>
@@ -765,13 +765,13 @@
<script>
# Add 3rd server to replicated servers list now that replication
# has been enabled on the 3rd one
- _topologyServerList = _topologyServerList + [server3]
+ resyncServerList = resyncServerList + [server3]
_splitServerList = _splitServerList + [server3]
- consumerList = consumerList + [server3]
+ resyncConsumerList = resyncConsumerList + [server3]
</script>
<paralleliterate var="server"
- in="_topologyServerList"
+ in="resyncServerList"
indexvar="i">
<sequence>
<script>
@@ -837,7 +837,7 @@
</call>
<paralleliterate var="server"
- in="_topologyServerList"
+ in="resyncServerList"
indexvar="i">
<sequence>
<script>
@@ -875,7 +875,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 ]
+ [ clientHost, clientPath, master, resyncConsumerList, synchroSuffix ]
</call>
</sequence>
--
Gitblit v1.10.0