[asterisk-commits] chan sip and res pjsip transports trying to bind to same port (testsuite[master])

[SVN commits to the Asterisk project]

Anonymous Coward #1000019 has submitted this change and it was merged.

Change subject: chan_sip and res_pjsip transports trying to bind to same port
......................................................................


chan_sip and res_pjsip transports trying to bind to same port

There still exists some tests (for instance, callee_local_blonde) that attempt
to load both chan_sip and res_pjsip modules at the same time and bind to their
transports to the same port.

The current conflicts file was "no loading" chan_sip for tests with a specified
dependency on res_pjsip. However, some tests opt to specify chan_pjsip as the
dependency instead. This patch makes it so if either or are listed as a
dependency then chan_sip won't load.

Change-Id: Ib4500a161e34f56d835975d90d82e3bd67a1a61f
---
M configs/conflicts.txt
M lib/python/asterisk/asterisk.py
2 files changed, 5 insertions(+), 4 deletions(-)

Approvals:
  Anonymous Coward #1000019: Verified
  Matt Jordan: Looks good to me, approved
  Joshua Colp: Looks good to me, but someone else must approve



diff --git a/configs/conflicts.txt b/configs/conflicts.txt
index bfc39cc..108c003 100644
--- a/configs/conflicts.txt
+++ b/configs/conflicts.txt
@@ -1,13 +1,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; this file contains a key/value mapping of conflicts between loadable modules.
 ;;
-;; if a test has a dependency (the key) it will not load the associated comma
-;; separated list of modules (the value).
+;; if a test has a dependency found in the comma separated list left of the
+;; equal sign (the key) it will not load the associated comma separated list
+;; of modules found on the right side of the equals (the value).
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; chan_sip and chan_pjsip don't play nice with each other unless configured
 ;; correctly so don't load chan_sip if it is a chan/res_pjsip test.
-res_pjsip=chan_sip.so
+chan_pjsip,res_pjsip=chan_sip.so
 
 ;; and don't load chan_pjsip if the test uses chan_sip
 chan_sip=chan_pjsip.so,res_pjsip.so,res_pjsip_pubsub.so,res_pjsip_session.so,res_pjsip_outbound_publish.so
diff --git a/lib/python/asterisk/asterisk.py b/lib/python/asterisk/asterisk.py
index 097d227..a287643 100755
--- a/lib/python/asterisk/asterisk.py
+++ b/lib/python/asterisk/asterisk.py
@@ -803,7 +803,7 @@
                         continue
 
                     key, val = line.split('=')
-                    if next((dep for dep in deps if key == dep.name), None):
+                    if next((dep for dep in deps if dep.name in key), None):
                         for value in val.split(','):
                             conflicts.append(value.strip())
         except:

-- 
To view, visit https://gerrit.asterisk.org/1375
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4500a161e34f56d835975d90d82e3bd67a1a61f
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>