[asterisk-commits] mjordan: testsuite/asterisk/trunk r3901 - /asterisk/trunk/tests/channels/SIP/...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Fri Jul 12 08:13:06 2013
New Revision: 3901

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3901
Log:
Fix SIP Hold test path problems

After the Test Suite was updated to handle long paths, the SIP Hold test was broken
due to an incorrect construction of the path to SIPp injection files. This patch fixes
that so that it builds the path to these files correctly.

Modified:
    asterisk/trunk/tests/channels/SIP/sip_hold/run-test

Modified: asterisk/trunk/tests/channels/SIP/sip_hold/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/sip_hold/run-test?view=diff&rev=3901&r1=3900&r2=3901
==============================================================================
--- asterisk/trunk/tests/channels/SIP/sip_hold/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/sip_hold/run-test Fri Jul 12 08:13:06 2013
@@ -19,14 +19,14 @@
 from twisted.internet import reactor
 
 logger = logging.getLogger(__name__)
-TEST_DIR = os.path.dirname(os.path.realpath(__file__))
-INJECT_FILE_BYPASS = TEST_DIR + "/sipp/inject_bypass.csv"
-INJECT_FILE_BRIDGE = TEST_DIR + "/sipp/inject_bridge.csv"
+INJECT_FILE_BYPASS = "inject_bypass.csv"
+INJECT_FILE_BRIDGE = "inject_bridge.csv"
 
 class SIPHold(TestCase):
     def __init__(self):
         TestCase.__init__(self)
         self.create_asterisk()
+
         self.sipp_phone_a_scenarios = [{'scenario':'phone_A.xml','-i':'127.0.0.2','-p':'5060','-inf':INJECT_FILE_BYPASS},
             {'scenario':'phone_A.xml','-i':'127.0.0.2','-p':'5060','-inf':INJECT_FILE_BYPASS},
             {'scenario':'phone_A.xml','-i':'127.0.0.2','-p':'5060','-inf':INJECT_FILE_BYPASS},
@@ -73,8 +73,8 @@
             logger.info("All scenarios executed")
             return
 
-        sipp_a = SIPpScenario(TEST_DIR, self.sipp_phone_a_scenarios[self.__test_counter])
-        sipp_b = SIPpScenario(TEST_DIR, self.sipp_phone_b_scenarios[self.__test_counter])
+        sipp_a = SIPpScenario(self.test_name, self.sipp_phone_a_scenarios[self.__test_counter])
+        sipp_b = SIPpScenario(self.test_name, self.sipp_phone_b_scenarios[self.__test_counter])
 
         # Start up the listener first - Phone A calls Phone B
         self.__a_finished = False