[asterisk-dev] [Code Review] 3060: pjsip tests: interactions with chan_sip cause test failures

[Kevin Harwell]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/3060/
-----------------------------------------------------------

Review request for Asterisk Developers and Matt Jordan.


Bugs: ASTERISK-22887
    https://issues.asterisk.org/jira/browse/ASTERISK-22887


Repository: testsuite


Description
-------

While chan_sip and chan_pjsip can be loaded and used at the same time it was causing problems in the testsuite because their defaults try to bind to the same host:port.  So for the testsuite made is so any test that depends on res_pjsip will "noload" chan_sip.  Instead of manipulating every current res_pjsip test (through their own modules.conf or config setting), this fix checks to see if the test requires/depends on res_pjsip and if it does it appends a noload => chan_sip.so to the copied modules.conf for that test.

This functionality is configured via the newly added conflicts.txt file.  Any new conflicts that may arise hopefully can resuse the mechanism.


Diffs
-----

  asterisk/trunk/lib/python/asterisk/asterisk.py 4415 
  asterisk/trunk/lib/python/asterisk/TestConfig.py 4415 
  asterisk/trunk/lib/python/asterisk/TestCase.py 4415 
  asterisk/trunk/configs/modules.conf PRE-CREATION 
  asterisk/trunk/configs/conflicts.txt PRE-CREATION 

Diff: https://reviewboard.asterisk.org/r/3060/diff/


Testing
-------


Thanks,

Kevin Harwell

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20131209/b9bb0507/attachment.html>