From 6c3260328b78722ac4fe60de73564b35f28d90bd Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 29 Apr 2013 13:18:30 +0000
Subject: [PATCH] CR-1618 Fix test group for replication-safe-read and replication-safe-data
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml | 5 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml | 5 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml | 7 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml | 7 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml | 7 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci.xml | 7 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml | 7 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml | 7 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml | 7 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml | 7 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml | 7 ++-
11 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci.xml
index fc6f3d2..2aeba08 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2012 ForgeRock AS.
+ ! Copyright 2012-2013 ForgeRock AS.
! -->
<stax>
<defaultcall function="replication_aci"/>
@@ -32,8 +32,9 @@
<block name="'replication_aci'">
<try>
<sequence>
- <script>
- CurrentTestPath['group'] = 'replication'
+ <script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'aci'
_group=CurrentTestPath['group']
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
index 3b97692..54c2166 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2012 ForgeRock AS.
+ ! Copyright 2012-2013 ForgeRock AS.
! -->
<stax>
<defaultcall function="replication_basic"/>
@@ -32,8 +32,9 @@
<block name="'replication_basic'">
<try>
<sequence>
- <script>
- CurrentTestPath['group'] = 'replication'
+ <script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'basic'
_group=CurrentTestPath['group']
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
index cf54328..c57c960 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2012 ForgeRock AS.
+ ! Copyright 2012-2013 ForgeRock AS.
! -->
<stax>
<defaultcall function="replication_binarycopy"/>
@@ -32,8 +32,9 @@
<block name="'replication_binarycopy'">
<try>
<sequence>
- <script>
- CurrentTestPath['group'] = 'replication'
+ <script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'binarycopy'
_group=CurrentTestPath['group']
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml
index d9467e5..631b2e1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2012 ForgeRock AS.
+ ! Copyright 2012-2013 ForgeRock AS.
! -->
<stax>
<defaultcall function="replication_changelog"/>
@@ -32,8 +32,9 @@
<block name="'replication_changelog'">
<try>
<sequence>
- <script>
- CurrentTestPath['group'] = 'replication'
+ <script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'changelog'
_group=CurrentTestPath['group']
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
index 9afe7ff..b57c5c8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2012 ForgeRock AS.
+ ! Copyright 2012-2013 ForgeRock AS.
! -->
<stax>
<defaultcall function="replication_conflict"/>
@@ -32,8 +32,9 @@
<block name="'replication_conflict'">
<try>
<sequence>
- <script>
- CurrentTestPath['group'] = 'replication'
+ <script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'conflict'
_group=CurrentTestPath['group']
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
index 4c7c348..1df3d27 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2012 ForgeRock AS.
+ ! Copyright 2012-2013 ForgeRock AS.
! -->
<stax>
<defaultcall function="replication_encryption"/>
@@ -32,8 +32,9 @@
<block name="'replication_encryption'">
<try>
<sequence>
- <script>
- CurrentTestPath['group'] = 'replication'
+ <script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'encryption'
_group=CurrentTestPath['group']
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
index 1554258..5b68c62 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2012 ForgeRock AS.
+ ! Copyright 2012-2013 ForgeRock AS.
! -->
<stax>
<defaultcall function="replication_failover"/>
@@ -33,7 +33,8 @@
<try>
<sequence>
<script>
- CurrentTestPath['group'] = 'replication'
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'failover'
_group=CurrentTestPath['group']
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
index b1442d2..e4f6352 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2012 ForgeRock AS.
+ ! Copyright 2012-2013 ForgeRock AS.
! -->
<stax>
<defaultcall function="replication_ldifimport"/>
@@ -32,8 +32,9 @@
<block name="'replication_ldifimport'">
<try>
<sequence>
- <script>
- CurrentTestPath['group'] = 'replication'
+ <script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'ldifimport'
_group=CurrentTestPath['group']
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
index b93735c..03c0aea 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2012 ForgeRock AS.
+ ! Copyright 2012-2013 ForgeRock AS.
! -->
<stax>
<defaultcall function="replication_resynchronization"/>
@@ -32,8 +32,9 @@
<block name="'replication_resynchronization'">
<try>
<sequence>
- <script>
- CurrentTestPath['group'] = 'replication'
+ <script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'resynchronization'
_group=CurrentTestPath['group']
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml
index 4063ffc..a5959c4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2012 ForgeRock AS.
+ ! Copyright 2012-2013 ForgeRock AS.
! -->
<stax>
<defaultcall function="replication_schema"/>
@@ -32,8 +32,9 @@
<block name="'replication_schema'">
<try>
<sequence>
- <script>
- CurrentTestPath['group'] = 'replication'
+ <script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'schema'
_group=CurrentTestPath['group']
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
index ff431db..c4ba85d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2012 ForgeRock AS.
+ ! Copyright 2012-2013 ForgeRock AS.
! -->
<stax>
<defaultcall function="replication_totalupdate"/>
@@ -33,7 +33,8 @@
<try>
<sequence>
<script>
- CurrentTestPath['group'] = 'replication'
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'totalupdate'
_group=CurrentTestPath['group']
--
Gitblit v1.10.0