From 6926f1df34c598eb39c6d3f033af6fd3e85fd5e4 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 05 Aug 2013 10:07:50 +0000
Subject: [PATCH] Disabled some replication/aci testcases depending on server configuration (split mode, upgrade)

---
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci.xml |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 60bebb1..64e47ae 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
@@ -103,8 +103,17 @@
                 <!-- List of Test Cases -->
                 <script>
                   testsList=[]
-                  testsList.append('replication_aci_001')
-                  testsList.append('replication_aci_002')
+                  
+                  if globalSplitServers is None:
+                    # External changelog not supported in replication split servers mode
+                    # This test case will only be run in normal mode 
+                    testsList.append('replication_aci_001')
+                    
+                  if UPGRADE_OPENDJNAME == '':
+                    # The global acis are not updated by the upgrade process
+                    # This test case will only be run on fresh install
+                    testsList.append('replication_aci_002')
+                  
                   testsList.append('replication_aci_003')
                   testsList.append('replication_aci_004')
                   testsList.append('replication_aci_005')

--
Gitblit v1.10.0