diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2009-06-29 15:57:48 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2009-06-29 15:57:48 +0000 |
| commit | 09057487cfbba725abb775931e9c9ed689d03b01 (patch) | |
| tree | cdafcab9428308cb61311f2cca61635692133d45 | |
| parent | f228749bfb0820ff05ef93e60c0082b1d5da9a32 (diff) | |
| download | qpid-python-09057487cfbba725abb775931e9c9ed689d03b01.tar.gz | |
Minor test env name cleanup which syncs with changes to store
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@789369 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | qpid/cpp/src/tests/run_cluster_tests | 14 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/testlib.py | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/qpid/cpp/src/tests/run_cluster_tests b/qpid/cpp/src/tests/run_cluster_tests index bfe6ef855e..bc98169524 100755 --- a/qpid/cpp/src/tests/run_cluster_tests +++ b/qpid/cpp/src/tests/run_cluster_tests @@ -68,15 +68,15 @@ export SENDER_EXEC=${top_builddir}/src/tests/sender #Make sure temp dir exists if this is the first to use it -TMP_STORE_DIR=${TEST_DIR}/test_tmp -if ! test -d ${TMP_STORE_DIR} ; then - mkdir -p ${TMP_STORE_DIR}/cluster +TMP_DATA_DIR=${TEST_DIR}/test_tmp +if ! test -d ${TMP_DATA_DIR} ; then + mkdir -p ${TMP_DATA_DIR}/cluster else # Delete old cluster test dirs - rm -rf ${TMP_STORE_DIR}/cluster - mkdir -p ${TMP_STORE_DIR}/cluster + rm -rf ${TMP_DATA_DIR}/cluster + mkdir -p ${TMP_DATA_DIR}/cluster fi -export TMP_STORE_DIR +export TMP_DATA_DIR sg ais -c "${srcdir}/cluster.py -v" @@ -86,6 +86,6 @@ if test x${RETCODE} != x0; then fi # Delete cluster store dir if test was successful. -rm -rf ${TMP_STORE_DIR} +rm -rf ${TMP_DATA_DIR} exit 0
\ No newline at end of file diff --git a/qpid/cpp/src/tests/testlib.py b/qpid/cpp/src/tests/testlib.py index 398eaf96cc..60f935b048 100644 --- a/qpid/cpp/src/tests/testlib.py +++ b/qpid/cpp/src/tests/testlib.py @@ -35,7 +35,7 @@ class TestBase(unittest.TestCase): _storeLib = os.getenv("STORE_LIB") _storeEnable = _storeLib != None # Must be True for durability to be enabled during the test _qpiddExec = os.getenv("QPIDD_EXEC", "/usr/sbin/qpidd") - _tempStoreDir = os.path.abspath(os.getenv("TMP_STORE_DIR", "/tmp/qpid")) + _tempStoreDir = os.path.abspath(os.getenv("TMP_DATA_DIR", "/tmp/qpid")) """Global message counter ensures unique messages""" _msgCnt = 0 @@ -190,7 +190,7 @@ class TestBaseCluster(TestBase): def createClusterNode(self, nodeNumber, clusterName): """Create a node and add it to the named cluster""" if self._tempStoreDir == None: - raise Exception("Environment variable TMP_STORE_DIR is not set") + raise Exception("Environment variable TMP_DATA_DIR is not set") if self._clusterLib == None: raise Exception("Environment variable LIBCLUSTER is not set") name = "%s-%d" % (clusterName, nodeNumber) |