<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://reviewboard.asterisk.org/r/3060/">https://reviewboard.asterisk.org/r/3060/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#e0e0e0" width="100%" cellpadding="8" style="border: 1px gray solid;">
<tr>
<td>
<h1 style="margin-right: 0.2em; padding: 0; font-size: 10pt;">This change has been marked as submitted.</h1>
</td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://reviewboard.asterisk.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Asterisk Developers and Matt Jordan.</div>
<div>By Kevin Harwell.</div>
<p style="color: grey;"><i>Updated Dec. 13, 2013, 3:32 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22887">ASTERISK-22887</a>
</div>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
testsuite
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">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.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>asterisk/trunk/lib/python/asterisk/asterisk.py <span style="color: grey">(4415)</span></li>
<li>asterisk/trunk/lib/python/asterisk/TestConfig.py <span style="color: grey">(4415)</span></li>
<li>asterisk/trunk/lib/python/asterisk/TestCase.py <span style="color: grey">(4415)</span></li>
<li>asterisk/trunk/configs/modules.conf <span style="color: grey">(PRE-CREATION)</span></li>
<li>asterisk/trunk/configs/conflicts.txt <span style="color: grey">(PRE-CREATION)</span></li>
</ul>
<p><a href="https://reviewboard.asterisk.org/r/3060/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>