From 5a6a88bd1e4831128c55f72923b18f5f771d45f2 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 04 May 2009 16:12:57 +0000
Subject: [PATCH] New functionality to run tests (functional and stress) on a remote machine

---
 opends/tests/staf-tests/shared/tests/config.py.stubs |  103 ++++++++++++++++++++++++++-------------------------
 1 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/opends/tests/staf-tests/shared/tests/config.py.stubs b/opends/tests/staf-tests/shared/tests/config.py.stubs
index bd072b9..7467c2c 100644
--- a/opends/tests/staf-tests/shared/tests/config.py.stubs
+++ b/opends/tests/staf-tests/shared/tests/config.py.stubs
@@ -23,54 +23,55 @@
 #
 #      Copyright 2007-2009 Sun Microsystems, Inc.
 
-TEST_OS_STRING              = '${os.name}'
-TEST_JVM_STRING             = '${java.version}(${sun.arch.data.model} bits)'
-STAF_LOCAL_HOSTNAME         = 'localhost'
-STAF_REMOTE_HOSTNAME        = 'localhost'
-TMPDIR                      = '${tests.tmp.dir}'
-PSWDFILE                    = '%s/password' % TMPDIR
-OPENDSDIR                   = '${project.home}'
-OPENDSNAME                  = '${product.name}'
-ZIPNAME                     = '${product.name}.zip'
-ZIPPATH                     = '${opends.dir}'
-TESTS_RUN_TIME              = '${tests.run.time}'
-TESTS_TYPE                  = '${tests.type}'
-TESTS_ROOT                  = '%s/tests/staf-tests' % OPENDSDIR
-TESTS_DIR                   = '%s/%s' % (TESTS_ROOT, TESTS_TYPE)
-TESTS_SHARED_DIR            = '%s/shared' % TESTS_DIR
-TESTS_FUNCTIONS_DIR         = '%s/shared/functions' % TESTS_ROOT
-TESTS_JAVA_DIR              = '%s/shared/java' % TESTS_ROOT
-TESTS_TOPOLOGY_DIR          = '%s/shared/topology' % TESTS_ROOT
-TESTS_XSL_DIR               = '%s/shared/xsl' % TESTS_ROOT
-DIRECTORY_INSTANCE_DN       = '${opends.admin.dn}'
-DIRECTORY_INSTANCE_PSWD     = '${opends.admin.pwd}'
-DIRECTORY_INSTANCE_BIN      = '%s' % TMPDIR
-DIRECTORY_INSTANCE_DIR      = '%s' % TMPDIR
-DIRECTORY_INSTANCE_HOST     = 'localhost'
-DIRECTORY_INSTANCE_PORT     = '${opends.port.ldap}'
-DIRECTORY_INSTANCE_ADMIN_PORT = '4444'
-DIRECTORY_INSTANCE_SSL_PORT = '${opends.port.ldaps}'
-DIRECTORY_INSTANCE_SFX      = 'dc=com'
-DIRECTORY_INSTANCE_BE       = 'userRoot'
-JAVA_HOME                   = '${java.path}'
-LOCAL_JAVA_HOME             = '${java.path}'
-LOGS_ROOT                   = '%s' % TMPDIR
-LOGS_URI                    = ''
-SEND_MAIL_AFTER_TEST_RUN    = '${staf.email.send}'
-SEND_MAIL_TO                = '${staf.email.to}'
-WC_TYPE                     = 'apache-tomcat'
-WC_VERSION                  = '6.0.14'
-WC_ZIPPATH                  = '${archives.dir}'
-WC_ZIPNAME                  = '%s-%s.zip' % (WC_TYPE, WC_VERSION)
-WC_DIRECTORY                = '%s' % TMPDIR
-WC_PORT                     = '9000'
-WC_SSL_PORT                 = '9001'
-WC_HOST                     = 'localhost'
-DSML_WARNAME                = '%s-DSML.war' % OPENDSNAME
-DSML_WARPATH                = '%s/build/package/%s' % (OPENDSDIR, DSML_WARNAME)
-SNMP_OPENDS_JARFILE         = '%s/lib/extensions/snmp-mib2605.jar' % OPENDSNAME
-SNMP_OPENDMK_LIBDIR         = '/path/to/opendmk/lib'
-SNMP_OPENDMK_JARFILE        = '%s/jdmkrt.jar' % SNMP_OPENDMK_LIBDIR
-SNMP_PORT                   = '8085'
-SNMP_TRAP_PORT              = '8086'
-VERBOSE_MODE                = 'False'
+TEST_OS_STRING                = '${tests.os.string}'
+TEST_JVM_STRING               = '${tests.jvm.string}'
+STAF_LOCAL_HOSTNAME           = '${local.hostname}'
+STAF_REMOTE_HOSTNAME          = '${remote.hostname}'
+TMPDIR                        = '/tmp'
+OPENDSNAME                    = '${opends.name}'
+ZIPNAME                       = '${opends.name}.zip'
+ZIPPATH                       = '${opends.dir}'
+TESTS_TYPE                    = '${tests.type}'
+TESTS_ROOT                    = '${basedir}'
+TESTS_DIR                     = '${tests.dir}'
+TESTS_SHARED_DIR              = '${tests.dir}/shared'
+TESTS_FUNCTIONS_DIR           = '${shared.dir}/functions'
+TESTS_JAVA_DIR                = '${shared.dir}/java'
+TESTS_TOPOLOGY_DIR            = '${shared.dir}/topology'
+TESTS_XSL_DIR                 = '${shared.dir}/xsl'
+TESTS_RESOURCE_DIR            = '${shared.dir}/resource'
+DIRECTORY_INSTANCE_DN         = '${opends.admin.dn}'
+DIRECTORY_INSTANCE_PSWD       = '${opends.admin.pwd}'
+DIRECTORY_INSTANCE_BIN        = '${tests.tmp.dir}'
+DIRECTORY_INSTANCE_DIR        = '${tests.tmp.dir}'
+DIRECTORY_INSTANCE_HOST       = '${remote.hostname}'
+DIRECTORY_INSTANCE_PORT       = '${opends.port.ldap}'
+DIRECTORY_INSTANCE_ADMIN_PORT = '${opends.port.admin}'
+DIRECTORY_INSTANCE_SSL_PORT   = '${opends.port.ldaps}'
+DIRECTORY_INSTANCE_SFX        = 'dc=com'
+DIRECTORY_INSTANCE_BE         = 'userRoot'
+REPLICATION_CONFIG_DIR        = '${tests.run.dir}/${tests.run.time}/config'
+JAVA_HOME                     = '${remote.javahome}'
+LOCAL_JAVA_HOME               = '${local.javahome}'
+LOGS_ROOT                     = '${tests.run.dir}/${tests.run.time}'
+LOGS_URI                      = '${logs.uri}'
+SEND_MAIL_AFTER_TEST_RUN      = '${email.enabled}'
+SEND_MAIL_TO                  = '${email.to}'
+SEND_MAIL_SUBJECT             = '${email.subject}'
+WC_TYPE                       = 'apache-tomcat'
+WC_VERSION                    = '${tomcat.version}'
+WC_ZIPPATH                    = '${archives.dir}'
+WC_ZIPNAME                    = '${tomcat.archive}'
+WC_DIRECTORY                  = '${tests.tmp.dir}'
+WC_PORT                       = '9000'
+WC_SSL_PORT                   = '9001'
+WC_HOST                       = '${remote.hostname}'
+DSML_WARNAME                  = '${opends.name}-DSML.war'
+DSML_WARPATH                  = '${opends.dir}/build/package/${opends.name}-DSML.war'
+SNMP_OPENDS_JARFILE           = '${opends.name}/lib/extensions/snmp-mib2605.jar'
+SNMP_OPENDMK_LIBDIR           = '${snmp.opendmk.lib.dir}'
+SNMP_OPENDMK_JARFILE          = '${snmp.opendmk.lib.dir}/jdmkrt.jar'
+SNMP_PORT                     = '8085'
+SNMP_TRAP_PORT                = '8086'
+VERBOSE_MODE                  = '${verbose.mode}'
+TEST_PLAN_CUSTOM              = '${test.plan.custom}'

--
Gitblit v1.10.0