From fbde9933f1727b295ae35bc835a680be4a7045fd Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Thu, 13 Jun 2013 09:03:45 +0000
Subject: [PATCH] CR-1845  Added debug traces in replication tests and fixed importldif/many_indexes stress testcase 

---
 opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes_tests.xml                          |    4 +-
 opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml |   46 +++++++++++++++++++++++
 opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml                            |   41 +++++++++++++++++++-
 3 files changed, 87 insertions(+), 4 deletions(-)

diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml
index ce2f942..0a0725a 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml
@@ -134,7 +134,13 @@
                   replServerPath = '%s/%s' % (replServer.getDir(), OPENDSNAME)
                 </script>
 
+
+                <!-- *************** -->
                 <!-- Trace for debug -->
+                <!-- *************** -->
+                <message>
+                  'DEBUG: Get attribute l for entry uid=iabizen.0 => value should be GEC'
+                </message>
                 <call function="'ldapSearchWithScript'">
                   { 'location'         : replServer.getHostname(),
                     'dsPath'           : replServerPath,
@@ -142,13 +148,44 @@
                     'dsInstancePort'   : replServer.getPort(),
                     'dsInstanceDn'     : replServer.getRootDn(),
                     'dsInstancePswd'   : replServer.getRootPwd(),
-                    'dsBaseDN'         : 'dc=replicationChanges',
-                    'dsFilter'         : 'objectclass=*'
+                    'dsBaseDN'         : userDn,
+                    'dsFilter'         : 'objectclass=*',
+                    'dsAttributes'     : 'l'
                   }                
                 </call>
                 <message>
                     STAXResult[0][1]
                 </message>
+                
+                <loop from="1" to="10">
+                  <sequence>
+	                <message>
+	                  'DEBUG: Get content of dc=replicationChanges' 
+	                </message>
+	                <call function="'ldapSearchWithScript'">
+	                  { 'location'         : replServer.getHostname(),
+	                    'dsPath'           : replServerPath,
+	                    'dsInstanceHost'   : replServer.getHostname(),
+	                    'dsInstancePort'   : replServer.getPort(),
+	                    'dsInstanceDn'     : replServer.getRootDn(),
+	                    'dsInstancePswd'   : replServer.getRootPwd(),
+	                    'dsBaseDN'         : 'dc=replicationChanges',
+	                    'dsFilter'         : 'objectclass=*'
+	                  }                
+	                </call>
+	                <message>
+	                    STAXResult[0][1]
+	                </message>
+
+		            <call function="'Sleep'">
+		              { 'sleepForMilliSeconds' :  2000 }
+		            </call>
+                  </sequence>
+                </loop>
+                <!-- *************** -->
+                <!-- Trace for debug -->
+                <!-- *************** -->
+                
   
                 <!-- Search for entry add -->
                 <call function="'ldapSearchWithScript'">
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
index fd47765..b925ca4 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
@@ -4949,6 +4949,52 @@
                 replServerPath = '%s/%s' % (replServer.getDir(), OPENDSNAME)
               </script>
               
+              
+              <!-- *************** -->
+              <!-- Trace for debug -->
+              <!-- *************** -->
+              <message>
+                'DEBUG: Get content of cn=changelog'
+              </message>
+              <call function="'ldapSearchWithScript'">
+                { 'location'         : replServer.getHostname(),
+                  'dsPath'           : replServerPath,
+                  'dsInstanceHost'   : replServer.getHostname(),
+                  'dsInstancePort'   : replServer.getPort(),
+                  'dsInstanceDn'     : replServer.getRootDn(),
+                  'dsInstancePswd'   : replServer.getRootPwd(),
+                  'dsBaseDN'         : 'cn=changelog',
+                  'dsFilter'         : 'objectclass=*'
+                }                
+              </call>
+              <message>
+                STAXResult[0][1]
+              </message>
+              
+              <message>
+                'DEBUG: Get value of purge delay'
+              </message>
+              <call function="'dsconfig'">
+                { 'location'            : replServer.getHostname(),
+                  'dsPath'              : replServerPath,
+                  'dsInstanceHost'      : replServer.getHostname(),
+                  'dsInstanceAdminPort' : replServer.getAdminPort(),
+                  'dsInstanceDn'        : replServer.getRootDn(),
+                  'dsInstancePswd'      : replServer.getRootPwd(),
+                  'subcommand'          : 'get-replication-server-prop',
+                  'objectType'          : 'provider-name',
+                  'objectName'          : 'Multimaster Synchronization',
+                  'optionsString'       : '--advanced'
+                }
+              </call>
+              <message>
+                STAXResult[0][1]
+              </message>
+              <!-- *************** -->
+              <!-- Trace for debug -->
+              <!-- *************** -->
+
+
               <message>
                 'Reading changelog in replication server %s:%s from index: \
                 %s' % \
diff --git a/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes_tests.xml b/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes_tests.xml
index cfac6b6..5601796 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes_tests.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes_tests.xml
@@ -23,7 +23,7 @@
  !
  ! CDDL HEADER END
  !
- !      Copyright 2012 ForgeRock AS.
+ !      Copyright 2012-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -97,7 +97,7 @@
                     'subcommand'           : 'create-local-db-index' ,
                     'objectType'           : 'backend-name' ,
                     'objectName'           : 'userRoot',
-                    'optionsString'        : '--index-name description --add index-type:approximate --add index-type:equality --add index-type:presence --add index-type:substring ' ,
+                    'optionsString'        : '--index-name employeeNumber --set index-type:approximate --set index-type:equality --set index-type:ordering --set index-type:presence --set index-type:substring ' ,
                     'expectedRC'           : 0 } 
                 </call> 
          

--
Gitblit v1.10.0