From 22be430c78e8ff8eab5927adb9c0079c9cc18e6e Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Tue, 30 Apr 2013 08:49:49 +0000
Subject: [PATCH] CR-1618 Fix test group for replication-safe-read and replication-safe-data (part2)
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml | 3 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml | 3 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency.xml | 5 ++---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml | 3 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml | 3 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml | 3 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml | 3 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml | 3 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml | 3 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml | 3 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci.xml | 3 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml | 3 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml | 3 +--
13 files changed, 14 insertions(+), 27 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 2aeba08..407c74c 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
@@ -37,8 +37,7 @@
CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'aci'
- _group=CurrentTestPath['group']
- _groupdir='%s/testcases/%s' % (TESTS_DIR,_group)
+ _groupdir='%s/testcases/replication' % TESTS_DIR
_label = 'Replication ACI'
</script>
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 54c2166..8b79ee3 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
@@ -37,8 +37,7 @@
CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'basic'
- _group=CurrentTestPath['group']
- _groupdir='%s/testcases/%s' % (TESTS_DIR,_group)
+ _groupdir='%s/testcases/replication' % TESTS_DIR
_label = 'Replication Basic'
</script>
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 c57c960..fadcc69 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
@@ -37,8 +37,7 @@
CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'binarycopy'
- _group=CurrentTestPath['group']
- _groupdir='%s/testcases/%s' % (TESTS_DIR,_group)
+ _groupdir='%s/testcases/replication' % TESTS_DIR
_label = 'Replication BinaryCopy'
</script>
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 631b2e1..39c7b88 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
@@ -37,8 +37,7 @@
CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'changelog'
- _group=CurrentTestPath['group']
- _groupdir='%s/testcases/%s' % (TESTS_DIR,_group)
+ _groupdir='%s/testcases/replication' % TESTS_DIR
_label = 'Replication Changelog'
</script>
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 b57c5c8..f96fcbc 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
@@ -37,8 +37,7 @@
CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'conflict'
- _group=CurrentTestPath['group']
- _groupdir='%s/testcases/%s' % (TESTS_DIR,_group)
+ _groupdir='%s/testcases/replication' % TESTS_DIR
_label = 'Replication Conflict'
</script>
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 1df3d27..1a570c1 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
@@ -37,8 +37,7 @@
CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'encryption'
- _group=CurrentTestPath['group']
- _groupdir='%s/testcases/%s' % (TESTS_DIR,_group)
+ _groupdir='%s/testcases/replication' % TESTS_DIR
_label = 'Replication Encryption'
</script>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml
index a4320e5..6ebd797 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml
@@ -50,9 +50,8 @@
CurrentTestPath['group']='replication'
CurrentTestPath['suite']='externalchangelog'
- _group = 'replication'
_suite = 'externalchangelog'
- _groupdir='%s/testcases/%s' % (TESTS_DIR,_group)
+ _groupdir='%s/testcases/replication' % TESTS_DIR
</script>
<call function="'testSuite_Preamble'"/>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency.xml
index a3e33af..6ef1022 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency.xml
@@ -49,9 +49,8 @@
CurrentTestPath['group']='replication'
CurrentTestPath['suite']='externalchangelog_consistency'
- _group = 'replication'
- _suite = 'externalchangelog'
- _groupdir='%s/testcases/%s' % (TESTS_DIR,_group)
+ _suite = 'externalchangelog_consistency'
+ _groupdir='%s/testcases/replication' % TESTS_DIR
</script>
<call function="'testSuite_Preamble'"/>
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 5b68c62..7c288df 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
@@ -37,8 +37,7 @@
CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'failover'
- _group=CurrentTestPath['group']
- _groupdir='%s/testcases/%s' % (TESTS_DIR,_group)
+ _groupdir='%s/testcases/replication' % TESTS_DIR
_label = 'Replication Failover'
</script>
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 e4f6352..ebf7dab 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
@@ -37,8 +37,7 @@
CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'ldifimport'
- _group=CurrentTestPath['group']
- _groupdir='%s/testcases/%s' % (TESTS_DIR,_group)
+ _groupdir='%s/testcases/replication' % TESTS_DIR
_label = 'Replication LDIFImport'
</script>
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 03c0aea..af48f32 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
@@ -37,8 +37,7 @@
CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'resynchronization'
- _group=CurrentTestPath['group']
- _groupdir='%s/testcases/%s' % (TESTS_DIR,_group)
+ _groupdir='%s/testcases/replication' % TESTS_DIR
_label = 'Replication Resync'
</script>
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 a5959c4..df068e6 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
@@ -37,8 +37,7 @@
CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'schema'
- _group=CurrentTestPath['group']
- _groupdir='%s/testcases/%s' % (TESTS_DIR,_group)
+ _groupdir='%s/testcases/replication' % TESTS_DIR
_label = 'Replication Schema'
</script>
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 c4ba85d..fc7bc85 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
@@ -37,8 +37,7 @@
CurrentTestPath['group']='replication'
CurrentTestPath['suite'] = 'totalupdate'
- _group=CurrentTestPath['group']
- _groupdir='%s/testcases/%s' % (TESTS_DIR,_group)
+ _groupdir='%s/testcases/replication' % TESTS_DIR
_label = 'Replication TotalUpdate'
</script>
--
Gitblit v1.10.0