[Asterisk-code-review] test case.py: Conflict dependencies not being processed (testsuite[master])

Jenkins2 asteriskteam at digium.com
Tue Jan 9 13:04:26 CST 2018


Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/7874 )

Change subject: test_case.py: Conflict dependencies not being processed
......................................................................

test_case.py: Conflict dependencies not being processed

When the testsuite installs config files it checks the 'conflicts.txt' file and
makes sure any conflicting modules do not load together. This feature was no
longer being used due to a wrongly passed in parameter to the install_configs
method. Instead of passing in the dependency list it passed in the config
object itself.

This patch makes it so the dependencies are once again passed into the method.

Change-Id: Icdac9a9b91d6c2a682f9e2124296fdcfbe3b96a0
---
M lib/python/asterisk/test_case.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/lib/python/asterisk/test_case.py b/lib/python/asterisk/test_case.py
index ec5e09d..1ef360e 100644
--- a/lib/python/asterisk/test_case.py
+++ b/lib/python/asterisk/test_case.py
@@ -301,7 +301,7 @@
                 # Copy test specific config files
                 self.ast[i].install_configs("%s/configs/ast%d" %
                                             (self.test_name, local_num),
-                                            self.test_config)
+                                            self.test_config.get_deps())
 
     def create_ami_factory(self, count=1, username="user", secret="mysecret",
                            port=5038):

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

Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Icdac9a9b91d6c2a682f9e2124296fdcfbe3b96a0
Gerrit-Change-Number: 7874
Gerrit-PatchSet: 1
Gerrit-Owner: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180109/8a8e2563/attachment.html>


More information about the asterisk-code-review mailing list