[asterisk-commits] pbx/callerid match: Close channels on shutdown. (testsuite[master])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Apr 20 17:46:06 CDT 2015


Mark Michelson has submitted this change and it was merged.

Change subject: pbx/callerid_match: Close channels on shutdown.
......................................................................


pbx/callerid_match: Close channels on shutdown.

This change fixes a bug in the test that leaves a channel open.  Clean shutdown
exposed a crash (ASTERISK-24774) which is fixed in 11.18.0 and 13.4.0, so this
test can no longer run in 1.8 or 12.

Change-Id: I0a1b421280d6d87a26fba01cc1005267aa3eab4c
---
M tests/pbx/callerid_match/run-test
M tests/pbx/callerid_match/test-config.yaml
2 files changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Mark Michelson: Looks good to me, approved; Verified
  Matt Jordan: Looks good to me, but someone else must approve



diff --git a/tests/pbx/callerid_match/run-test b/tests/pbx/callerid_match/run-test
index 2e0e27a..bfc692d 100755
--- a/tests/pbx/callerid_match/run-test
+++ b/tests/pbx/callerid_match/run-test
@@ -49,9 +49,10 @@
     def fastagi_connect(self, agi):
         LOGGER.info("sample%s.call file executed." % (self.test))
 
+        reactor.callLater(2, agi.finish)
         if self.test < self.num_tests:
             self.launch_test()
-        else: self.finalize()
+        else: reactor.callLater(4, self.finalize)
 
     def move_file(self, i):
         LOGGER.info("Moving the sample%s.call file to the spool dir..." % (i))
diff --git a/tests/pbx/callerid_match/test-config.yaml b/tests/pbx/callerid_match/test-config.yaml
index f28eb1f..adb426c 100644
--- a/tests/pbx/callerid_match/test-config.yaml
+++ b/tests/pbx/callerid_match/test-config.yaml
@@ -3,7 +3,7 @@
     description: 'Sends calls into test context with various callerid'
 
 properties:
-    minversion: '1.8.0.0'
+    minversion: ['11.18.0', '13.4.0']
     dependencies:
         - python: 'twisted'
         - python: 'starpy'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a1b421280d6d87a26fba01cc1005267aa3eab4c
Gerrit-PatchSet: 3
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>



More information about the asterisk-commits mailing list