[svn-commits] sgriepentrog: testsuite/asterisk/trunk r5341 - in /asterisk/trunk: lib/python...

[SVN commits to the Digium repositories]

Author: sgriepentrog
Date: Tue Aug  5 16:53:26 2014
New Revision: 5341

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5341
Log:
testsuite: fail sipp test if sipp not installed

If sipp is not listed as a dependency and isn't
installed, the sipp test case hangs while it is
trying to kill a nonexistant process.  Instead,
check if it is installed and raise an exception
if not.  Also fixed the missing dependancy that
precipitated this discovery.


Modified:
    asterisk/trunk/lib/python/asterisk/sipp.py
    asterisk/trunk/tests/channels/pjsip/registration/inbound/nominal/user_agent/test-config.yaml

Modified: asterisk/trunk/lib/python/asterisk/sipp.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/sipp.py?view=diff&rev=5341&r1=5340&r2=5341
==============================================================================
--- asterisk/trunk/lib/python/asterisk/sipp.py (original)
+++ asterisk/trunk/lib/python/asterisk/sipp.py Tue Aug  5 16:53:26 2014
@@ -502,6 +502,8 @@
         self.target = target
         self._our_exit_deferred = None
         self._test_case = None
+        if not self.sipp:
+            raise ValueError("SIPpTestObject requires that sipp is installed")
 
     def kill(self):
         """Kill the executing SIPp scenario"""

Modified: asterisk/trunk/tests/channels/pjsip/registration/inbound/nominal/user_agent/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/registration/inbound/nominal/user_agent/test-config.yaml?view=diff&rev=5341&r1=5340&r2=5341
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/registration/inbound/nominal/user_agent/test-config.yaml (original)
+++ asterisk/trunk/tests/channels/pjsip/registration/inbound/nominal/user_agent/test-config.yaml Tue Aug  5 16:53:26 2014
@@ -69,6 +69,8 @@
 properties:
     minversion: '12.2.0'
     dependencies:
+        - sipp:
+            version: 'v3.0'
         - buildoption: 'TEST_FRAMEWORK'
         - python: 'twisted'
         - python: 'starpy'