svn commit: r789369 - in /qpid/trunk/qpid/cpp/src/tests: run_cluster_tests testlib.py

[kp...@apache.org]

Author: kpvdr
Date: Mon Jun 29 15:57:48 2009
New Revision: 789369

URL: http://svn.apache.org/viewvc?rev=789369&view=rev
Log:
Minor test env name cleanup which syncs with changes to store

Modified:
    qpid/trunk/qpid/cpp/src/tests/run_cluster_tests
    qpid/trunk/qpid/cpp/src/tests/testlib.py

Modified: qpid/trunk/qpid/cpp/src/tests/run_cluster_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_cluster_tests?rev=789369&r1=789368&r2=789369&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_cluster_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_cluster_tests Mon Jun 29 15:57:48 2009
@@ -68,15 +68,15 @@
 
 
 #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 @@
 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

Modified: qpid/trunk/qpid/cpp/src/tests/testlib.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/testlib.py?rev=789369&r1=789368&r2=789369&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/testlib.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/testlib.py Mon Jun 29 15:57:48 2009
@@ -35,7 +35,7 @@
     _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 @@
     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)



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org