[rhmessaging-commits] rhmessaging commits: r3857 - in store/trunk/cpp/tests: new_python_tests and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2010-02-24 15:46:49 -0500 (Wed, 24 Feb 2010)
New Revision: 3857

Modified:
   store/trunk/cpp/tests/new_python_tests/client_persistence.py
   store/trunk/cpp/tests/tests_env.sh
Log:
Fix for changed python paths (r.910016) which were causing qmf to fail in new_python_tests.

Modified: store/trunk/cpp/tests/new_python_tests/client_persistence.py
===================================================================
--- store/trunk/cpp/tests/new_python_tests/client_persistence.py	2010-02-19 18:52:40 UTC (rev 3856)
+++ store/trunk/cpp/tests/new_python_tests/client_persistence.py	2010-02-24 20:46:49 UTC (rev 3857)
@@ -189,13 +189,13 @@
 
     def testExchange(self):
         """Exchange alternate exchange property persistence test"""
-        broker = self.broker(storeArgs(), name="testBroker", expect=EXPECT_EXIT_OK)
+        broker = self.broker(storeArgs(), name="testExchangeBroker", expect=EXPECT_EXIT_OK)
         qmf = Qmf(broker)
         qmf.addExchange("altExch", "direct", durable=True) # Serves as alternate exchange instance
         qmf.addExchange("testExch", "direct", durable=True, altExchangeName="altExch")
         broker.terminate()
 
-        broker = self.broker(storeArgs(), name="testBroker")
+        broker = self.broker(storeArgs(), name="testExchangeBroker")
         qmf = Qmf(broker)
         try: qmf.addExchange("altExch", "direct", passive=True)
         except Exception, e: self.fail("Alternate exchange (\"altExch\") instance not recovered: %s" % e)
@@ -205,13 +205,13 @@
         
     def testQueue(self):
         """Queue alternate exchange property persistexchangeNamece test"""
-        broker = self.broker(storeArgs(), name="testBroker", expect=EXPECT_EXIT_OK)
+        broker = self.broker(storeArgs(), name="testQueueBroker", expect=EXPECT_EXIT_OK)
         qmf = Qmf(broker)
         qmf.addExchange("altExch", "direct", durable=True) # Serves as alternate exchange instance
         qmf.addQueue("testQueue", durable=True, altExchangeName="altExch")
         broker.terminate()
 
-        broker = self.broker(storeArgs(), name="testBroker")
+        broker = self.broker(storeArgs(), name="testQueueBroker")
         qmf = Qmf(broker)
         try: qmf.addExchange("altExch", "direct", passive=True)
         except Exception, e: self.fail("Alternate exchange (\"altExch\") instance not recovered: %s" % e)
@@ -238,4 +238,3 @@
         self.assertEqual(mc, rm.content)
         self.assertTrue(rm.redelivered)
 
-    
\ No newline at end of file

Modified: store/trunk/cpp/tests/tests_env.sh
===================================================================
--- store/trunk/cpp/tests/tests_env.sh	2010-02-19 18:52:40 UTC (rev 3856)
+++ store/trunk/cpp/tests/tests_env.sh	2010-02-24 20:46:49 UTC (rev 3857)
@@ -92,7 +92,7 @@
 	
 	    # Paths and dirs
 	    PYTHON_DIR="${QPID_DIR}/python"
-	    export PYTHONPATH="${PYTHON_DIR}":"${QPID_DIR}/cpp/src/tests":"${abs_srcdir}"
+	    export PYTHONPATH="${PYTHONPATH}":"${PYTHON_DIR}":"${QPID_DIR}/extras/qmf/src/py":"${QPID_DIR}/tools/src/py":"${QPID_DIR}/cpp/src/tests":"${abs_srcdir}"
 	
 	    # Libraries