From 504f0f7a278410099e966d7689c07b106f88cb06 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Wed, 13 Jun 2007 21:56:23 +0000
Subject: [PATCH] Issue 1784 data and temporary files must go into a unique folder
---
opends/tests/functional-tests/staf-installer/config.py.stubs | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/opends/tests/functional-tests/staf-installer/config.py.stubs b/opends/tests/functional-tests/staf-installer/config.py.stubs
index 71af780..584c57b 100644
--- a/opends/tests/functional-tests/staf-installer/config.py.stubs
+++ b/opends/tests/functional-tests/staf-installer/config.py.stubs
@@ -3,8 +3,6 @@
TEST_JVM_STRING = '${java.version}(${sun.arch.data.model} bits)'
STAF_LOCAL_HOSTNAME = 'localhost'
STAF_REMOTE_HOSTNAME = 'localhost'
-STAF_JAVA_HOME = '${java.home}'
-STAF_HOME_DIR = '${staf.install.dir}'
TMPDIR = '${staf.tmp.dir}'
PSWDFILE = '%s/password' % TMPDIR
OPENDSDIR = '${project.home}'
@@ -17,7 +15,6 @@
TESTS_FUNCTIONS_DIR = '%s/functions' % TESTS_SHARED_DIR
TESTS_DATA_DIR = '%s/data' % TESTS_SHARED_DIR
TESTS_JAVA_DIR = '%s/java' % TESTS_SHARED_DIR
-TMP_DATA_DIR = '%s/functional-tests' % TMPDIR
DIRECTORY_INSTANCE_DN = '${opends.admin.dn}'
DIRECTORY_INSTANCE_PSWD = '${opends.admin.pwd}'
DIRECTORY_INSTANCE_DIR = '%s' % TMPDIR
@@ -26,10 +23,8 @@
DIRECTORY_INSTANCE_SSL_PORT = '${opends.port.ldaps}'
DIRECTORY_INSTANCE_SFX = 'dc=com'
DIRECTORY_INSTANCE_BE = 'userRoot'
-STAGED_DATA_DIR = '%s/shared/data' % TMP_DATA_DIR
-LOCAL_DATA_DIR = '%s/functional-tests/shared/data' % TMPDIR
+JAVA_HOME = '${java.home}'
LOGS_ROOT = '%s' % TMPDIR
LOGS_URI = ''
-JAVA_HOME = '${java.home}'
SEND_MAIL_AFTER_TEST_RUN = '${staf.email.send}'
SEND_MAIL_TO = '${staf.email.to}'
--
Gitblit v1.10.0