[asterisk-dev] Change in testsuite[master]: sip_attended_transfer now supports pre-12 Asterisk versions.
Matt Jordan has posted comments on this change. Change subject: sip_attended_transfer now supports pre-12 Asterisk versions. .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.asterisk.org/29 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I958c52cebb94f9cfc8dc8ed81311ae62efb2679d Gerrit-PatchSet: 3 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Ashley Sanders asand...@digium.com Gerrit-Reviewer: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: sip_attended_transfer now supports pre-12 Asterisk versions.
Matt Jordan has submitted this change and it was merged.
Change subject: sip_attended_transfer now supports pre-12 Asterisk versions.
..
sip_attended_transfer now supports pre-12 Asterisk versions.
The sip_attended transfer test was recently rewritten to prevent it from
bouncing during automatic test runs. The rewrite attempted to break into
two tests in an attempt to separate the logic of different versions from
one another.
Ashley pointed out on my original Asterisk 11 version of the patch that
there are only small difference between the Asterisk 11 and 12 versions
of the test, resulting in a lot of repeated boilerplate code that could
otherwise be avoided.
This change alters the 12+ specific test by separating the bridge logic
for different versions into their own classes. I have verified that the
test passes using both Asterisk 11 and Asterisk 13.
Change-Id: I958c52cebb94f9cfc8dc8ed81311ae62efb2679d
Fix a typo where a function call was evaluated as a boolean.
Change-Id: I958c52cebb94f9cfc8dc8ed81311ae62efb2679d
Address review feedback from Ashley and Matt
* Make efforts to make pylint less angry
* Add debugging to the 11 version since it's weird
* Changed some variable names. I went with the suggested names in some
case, but in others I did not.
Change-Id: I958c52cebb94f9cfc8dc8ed81311ae62efb2679d
---
M tests/channels/SIP/sip_attended_transfer/attended_transfer.py
M tests/channels/SIP/sip_attended_transfer/test-config.yaml
2 files changed, 199 insertions(+), 45 deletions(-)
Approvals:
Matt Jordan: Looks good to me, approved; Verified
Ashley Sanders: Looks good to me, but someone else must approve
diff --git a/tests/channels/SIP/sip_attended_transfer/attended_transfer.py
b/tests/channels/SIP/sip_attended_transfer/attended_transfer.py
index cb133f3..ddf8736 100644
--- a/tests/channels/SIP/sip_attended_transfer/attended_transfer.py
+++ b/tests/channels/SIP/sip_attended_transfer/attended_transfer.py
@@ -8,7 +8,11 @@
import logging
import pjsua as pj
+import sys
+sys.path.append('lib/python/asterisk')
+
+from version import AsteriskVersion
from twisted.internet import reactor
LOGGER = logging.getLogger(__name__)
@@ -52,8 +56,8 @@
reactor.callFromThread(self.on_answered)
-class BridgeState(object):
-'''Object for tracking state of a bridge
+class BridgeTwelve(object):
+'''Object for tracking attributes of an Asterisk 12+ bridge
The main data the test cares about is the bridge's unique id and whether
two
channels have been bridged together by the bridge.
@@ -61,6 +65,159 @@
def __init__(self):
self.unique_id = None
self.bridged = False
+
+
+class BridgeStateTwelve(object):
+'''Tracker of Bridge State for Asterisk 12+
+
+Since Asterisk 12+ has the concept of Bridge objects, this tracks the
+bridges by detecting when they are created. Once bridges are created, we
+determine that channels are bridged when BridgeEnter events indicate that
+two channels are present.
+'''
+def __init__(self, test_object, controller, ami):
+self.test_object = test_object
+self.controller = controller
+self.ami = ami
+self.bridge1 = BridgeTwelve()
+self.bridge2 = BridgeTwelve()
+
+self.ami.registerEvent('BridgeCreate', self.bridge_create)
+self.ami.registerEvent('BridgeEnter', self.bridge_enter)
+
+def bridge_create(self, _, event):
+'''AMI event callback for BridgeCreate
+
+This method is responsible for gleaning the unique IDs of bridges that
+are created and saving them for later.
+'''
+
+if not self.bridge1.unique_id:
+self.bridge1.unique_id = event.get('bridgeuniqueid')
+elif not self.bridge2.unique_id:
+self.bridge2.unique_id = event.get('bridgeuniqueid')
+else:
+LOGGER.error(Unexpected third bridge created)
+self.test_object.set_passed(False)
+self.test_object.stop_reactor()
+
+def bridge_enter(self, _, event):
+'''AMI event callback for BridgeEnter
+
+This method makes the determination of whether the controller
+is allowed to attempt to move on to the next state based on
+the states of the two bridges involved
+'''
+
+if (event.get('bridgeuniqueid') == self.bridge1.unique_id and
+event.get('bridgenumchannels') == '2'):
+self.bridge1.bridged = True
+if self.controller.state == BOB_CALLED:
+self.controller.call_carol()
+elif self.controller.state == TRANSFERRED:
+self.controller.hangup_calls()
+else:
+LOGGER.error(Unexpected BridgeEnter event)
+self.test_object.set_passed(False)
+self.test_object.stop_reactor()
+elif (event.get('bridgeuniqueid') ==
[asterisk-dev] Change in testsuite[master]: sip_attended_transfer now supports pre-12 Asterisk versions.
Matt Jordan has posted comments on this change. Change subject: sip_attended_transfer now supports pre-12 Asterisk versions. .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.asterisk.org/29 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I958c52cebb94f9cfc8dc8ed81311ae62efb2679d Gerrit-PatchSet: 3 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Ashley Sanders asand...@digium.com Gerrit-Reviewer: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: sip_attended_transfer now supports pre-12 Asterisk versions.
Matt Jordan has posted comments on this change. Change subject: sip_attended_transfer now supports pre-12 Asterisk versions. .. Patch Set 2: (1 comment) While my comment is piddly, I think a little bit more debug logging thrown into the Asterisk 1.8/11 case would be pretty helpful. It's often very difficult to figure out why a transfer test for those Asterisk versions fails - particularly since the event model presented by AMI can be rather confusing. https://gerrit.asterisk.org/#/c/29/2/tests/channels/SIP/sip_attended_transfer/attended_transfer.py File tests/channels/SIP/sip_attended_transfer/attended_transfer.py: Line 153: if numchans == 1: : self.controller.call_carol() : elif numchans == 2: : self.controller.transfer_call() Since Asterisk 11 Bridge events are 'weird' (aka: confusing and prone to breakage), a few DEBUG statements in here might be nice. -- To view, visit https://gerrit.asterisk.org/29 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I958c52cebb94f9cfc8dc8ed81311ae62efb2679d Gerrit-PatchSet: 2 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: Yes -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add a test for PJSIP t38 with authentication based on normal...
Matt Jordan has posted comments on this change. Change subject: Add a test for PJSIP t38 with authentication based on normal t38 test The test will start two instances of Asterisk. The first will originate a PJSIP call with authentication to the second using an extension that will run sendFax. The second will receive .. Patch Set 2: (5 comments) https://gerrit.asterisk.org/#/c/28/2//COMMIT_MSG Commit Message: Line 7: Add a test for PJSIP t38 with authentication based on normal t38 test : The test will start two instances of Asterisk. The first will originate Place a blank line between the commit summary and the commit body. Line 14: ASTERISK-24933 Add the Reported by: field at least. https://gerrit.asterisk.org/#/c/28/2/tests/fax/pjsip/t38_with_auth/run-test File tests/fax/pjsip/t38_with_auth/run-test: Line 26: Test class for performing the test. Manages files, originates FAX call, : and monitors a user event to verify that the fax completed successfully on : the sender end of the call. Pydoc comments should always have a single line summary (79 characters) and a description below them, if warranted. This comment applies to all Pydoc comments in this test. Line 68:LOGGER.error(error sending fax through t38:) : LOGGER.error(operation: %s % (event['operation'],)) : LOGGER.error(status: %s % (event['status'],)) : LOGGER.error(error: %s % (event['error'],)) : LOGGER.error(statusstr: %s % (event['statusstr'],)) Nitpick: capitalization please :-) https://gerrit.asterisk.org/#/c/28/2/tests/fax/pjsip/t38_with_auth/test-config.yaml File tests/fax/pjsip/t38_with_auth/test-config.yaml: Line 9: Use the YAML tag for issues: issues: - jira: 'ASTERISK-24933' -- To view, visit https://gerrit.asterisk.org/28 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If37cf20857ae3c0b35e0637a0a2cb7e7d6226df6 Gerrit-PatchSet: 2 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Jonathan Rose jr...@digium.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: Yes -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: tests/rest_api/channels: Add a channel hold intercept test
Matt Jordan has uploaded a new patch set (#3). Change subject: tests/rest_api/channels: Add a channel hold intercept test .. tests/rest_api/channels: Add a channel hold intercept test This test verifies that a channel that initiates a call hold with the HOLD_INTERCEPT function enabled on it will have the hold frame intercepte and turned into an event for ARI clients. A Local channel enters the Stasis application, and the HOLD_INTERCEPT function is placed on the channel. A POST /hold operation is then used to simulate a call hold on the channel. The test verifies that a ChannelHold event is raised with the channel initating the hold. A DELETE /hold operation is then used, and a ChannelUnhold event is raised with the channel initiating the unhold. ASTERISK-24922 Reported by: Matt Jordan Change-Id: If8bdbc74e0789d0c13ffbc5cb0c852f5f3a04012 --- A tests/rest_api/channels/hold/hold_intercept/configs/ast1/extensions.conf A tests/rest_api/channels/hold/hold_intercept/hold_intercept.py A tests/rest_api/channels/hold/hold_intercept/test-config.yaml A tests/rest_api/channels/hold/tests.yaml M tests/rest_api/channels/tests.yaml 5 files changed, 124 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/16/16/3 -- To view, visit https://gerrit.asterisk.org/16 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If8bdbc74e0789d0c13ffbc5cb0c852f5f3a04012 Gerrit-PatchSet: 3 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Memory Debugging Improvements
Matt Jordan has posted comments on this change. Change subject: Memory Debugging Improvements .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.asterisk.org/15 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I21634673508a01eea1f489c751d3cf75ea55cf06 Gerrit-PatchSet: 4 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Corey Farrell g...@cfware.com Gerrit-Reviewer: Ashley Sanders asand...@digium.com Gerrit-Reviewer: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Memory Debugging Improvements
Matt Jordan has submitted this change and it was merged. Change subject: Memory Debugging Improvements .. Memory Debugging Improvements * Enable XML output from valgrind. * Display and save a summary of valgrind errors and leaks. * Enable use of contrib/valgrind/suppressions.txt if it exists to suppress expected leaks or system library errors. Added entry to .gitignore for this file. * Supply a sample suppressions file that ignores some reachable memory. * Create stdout_print for printing messages to the terminal and including in the failure message. * Switch some failure notifications to use stdout_print() so the messages are included in asterisk-test-suite-report.xml. * Create function for archiving a list of files from source folder to destination folder. Switch all archive functions to use this. Valgrind Summaries require the lxml module. If this module is not found summaries will not be produced, but valgrind XML output will still be available in the Asterisk logs directory. Change-Id: I21634673508a01eea1f489c751d3cf75ea55cf06 --- M .gitignore M README.txt A contrib/valgrind/summary-lines.xsl A contrib/valgrind/suppressions-sample.txt M lib/python/asterisk/asterisk.py M runtests.py 6 files changed, 192 insertions(+), 47 deletions(-) Approvals: Matt Jordan: Looks good to me, approved; Verified Ashley Sanders: Looks good to me, but someone else must approve diff --git a/.gitignore b/.gitignore index cf96d9e..b7f92b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.pyc asterisk-test-suite-report.xml /astroot +/contrib/valgrind/suppressions.txt /logs diff --git a/README.txt b/README.txt index 30027f2..f6c5b80 100644 --- a/README.txt +++ b/README.txt @@ -127,6 +127,7 @@ $ make update $ make install - python-twisted +- python-lxml - pjsua - Download and build pjproject 1.x from source - http://www.pjsip.org/download.htm diff --git a/contrib/valgrind/summary-lines.xsl b/contrib/valgrind/summary-lines.xsl new file mode 100644 index 000..c06faaf --- /dev/null +++ b/contrib/valgrind/summary-lines.xsl @@ -0,0 +1,63 @@ +?xml version=1.0 encoding=utf-8? +xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; +!-- + The XML output of this stylesheet is used internally for producing + text based summary. The output is processed by runtests.py, + TestRun._process_valgrind. +-- + +xsl:template match=/valgrindoutput + xml + xsl:if test=error | suppcounts/pair + lineValgrind xsl:value-of select=tool / resultsxsl:if test=usercomment - xsl:value-of select=usercomment //xsl:if/line + line / + /xsl:if + xsl:if test=error/what + line= Errors ==/line + xsl:for-each select=error[what] + cols + xsl:attribute name=col1xsl:value-of select=kind//xsl:attribute + xsl:attribute name=col2xsl:value-of select=what//xsl:attribute + /cols + /xsl:for-each + line / + /xsl:if + xsl:if test=error/xwhat/leakedbytes + line== Leaked Memory ==/line + xsl:if test=error[kind='Leak_DefinitelyLost']/xwhat/leakedbytes + cols col1=Definitely Lost + xsl:attribute name=col2 + xsl:value-of select=sum(error[kind='Leak_DefinitelyLost']/xwhat/leakedbytes | error[kind='Leak_IndirectlyLost']/xwhat/leakedbytes) / bytes + /xsl:attribute + /cols + /xsl:if + xsl:if test=error[kind='Leak_PossiblyLost']/xwhat/leakedbytes + cols col1=Possible Lost + xsl:attribute name=col2 + xsl:value-of select=sum(error[kind='Leak_PossiblyLost']/xwhat/leakedbytes) / bytes + /xsl:attribute + /cols + /xsl:if + xsl:if test=error[kind='Leak_StillReachable']/xwhat/leakedbytes + cols col1=Reachable Memory + xsl:attribute name=col2 + xsl:value-of select=sum(error[kind='Leak_StillReachable']/xwhat/leakedbytes) / bytes + /xsl:attribute + /cols + /xsl:if
[asterisk-dev] Change in testsuite[master]: Memory Debugging Improvements
Matt Jordan has posted comments on this change. Change subject: Memory Debugging Improvements .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.asterisk.org/15 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I21634673508a01eea1f489c751d3cf75ea55cf06 Gerrit-PatchSet: 4 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Corey Farrell g...@cfware.com Gerrit-Reviewer: Ashley Sanders asand...@digium.com Gerrit-Reviewer: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add a test for PJSIP t38 with authentication based on normal...
Matt Jordan has posted comments on this change.
Change subject: Add a test for PJSIP t38 with authentication based on normal
t38 test
..
Patch Set 1:
(1 comment)
https://gerrit.asterisk.org/#/c/22/1/tests/fax/pjsip/t38_with_auth/configs/ast1/extensions.conf
File tests/fax/pjsip/t38_with_auth/configs/ast1/extensions.conf:
Line 3: exten = 1234,n,SendFax(${ASTDATADIR}/send.tiff)
@Matt Jordan, is SendFax similar to Stasis in that once the channel is hand
No, but if the channel is still active when it leaves the SendFax dialplan
application, it will be immediately hung up because there's no more dialplan to
execute, and (assuming fall-through is enabled, which it shouldn't be), there
are no more matching extensions within this context.
--
To view, visit https://gerrit.asterisk.org/22
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id8fd9683dc1b61e7b1afd2b6ede857921beebb88
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Jonathan Rose jr...@digium.com
Gerrit-Reviewer: Ashley Sanders asand...@digium.com
Gerrit-Reviewer: Matt Jordan mjor...@digium.com
Gerrit-HasComments: Yes
--
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Rewrite sip_attended_transfer test to stop failing.
Matt Jordan has submitted this change and it was merged.
Change subject: Rewrite sip_attended_transfer test to stop failing.
..
Rewrite sip_attended_transfer test to stop failing.
The sip_attended_transfer test has been bouncing for a while. There
are two major fixes introduced here to prevent the bouncing.
First, by converting to using the testsuite's PJSUA module, we no
longer are using the native Python threading library. Instead, we
are using a method that works better with the Twisted framework.
Second, the test is more strict about when the transfer may be
performed. The previous test would attempt the transfer when Asterisk
reported that the call was bridged. The problem is that Asterisk may
report the call as bridged before PJSUA has properly processed the
200 OK that Asterisk has sent to it. By waiting, we can be sure that
all parties are prepared when the transfer is attempted.
The test has also been rewritten to only work with Asterisk 12+. A
new separate test will be written to work on Asterisk 11. This helps
the code to be a little less cluttered.
Change-Id: I1676801d90bcafc28ba25e8b6889f40ab08cc90e
Address review feedback from Ashley
* Two CallCallback classes have been combined into one
* Bridge state has been factored into a minimal class
* Unnecessary checks of test state have been removed.
Change-Id: I1676801d90bcafc28ba25e8b6889f40ab08cc90e
---
A tests/channels/SIP/sip_attended_transfer/attended_transfer.py
M tests/channels/SIP/sip_attended_transfer/configs/ast1/extensions.conf
M tests/channels/SIP/sip_attended_transfer/configs/ast1/sip.conf
D tests/channels/SIP/sip_attended_transfer/run-test
M tests/channels/SIP/sip_attended_transfer/test-config.yaml
5 files changed, 234 insertions(+), 216 deletions(-)
Approvals:
Matt Jordan: Looks good to me, approved; Verified
Ashley Sanders: Looks good to me, but someone else must approve
diff --git a/tests/channels/SIP/sip_attended_transfer/attended_transfer.py
b/tests/channels/SIP/sip_attended_transfer/attended_transfer.py
new file mode 100644
index 000..cb133f3
--- /dev/null
+++ b/tests/channels/SIP/sip_attended_transfer/attended_transfer.py
@@ -0,0 +1,183 @@
+
+Copyright (C) 2015, Digium, Inc.
+Mark Michelson mmichel...@digium.com
+
+This program is free software, distributed under the terms of
+the GNU General Public License Version 2.
+
+
+import logging
+import pjsua as pj
+
+from twisted.internet import reactor
+
+LOGGER = logging.getLogger(__name__)
+
+INIT = 0
+BOB_CALLED = 1
+CAROL_CALLED = 2
+TRANSFERRED = 3
+
+
+class TransferAccountCallback(pj.AccountCallback):
+'''Generic Account callback for Bob and Carol.
+
+The sole purpose of this callback is to auto-answer
+incoming calls
+'''
+
+def __init__(self, account):
+pj.AccountCallback.__init__(self, account)
+
+def on_incoming_call(self, call):
+call.answer(200)
+
+
+class CallCallback(pj.CallCallback):
+'''Call Callback used for Calls made by Alice.
+
+Each call has some specific action it is expected
+to take once the call has been confirmed to be
+answered. The on_state method is overridden to
+signal to the test that Alice is prepared for the
+next step
+'''
+
+def __init__(self, call, on_answered):
+pj.CallCallback.__init__(self, call)
+self.on_answered = on_answered
+
+def on_state(self):
+if self.call.info().state == pj.CallState.CONFIRMED:
+reactor.callFromThread(self.on_answered)
+
+
+class BridgeState(object):
+'''Object for tracking state of a bridge
+
+The main data the test cares about is the bridge's unique id and whether
two
+channels have been bridged together by the bridge.
+'''
+def __init__(self):
+self.unique_id = None
+self.bridged = False
+
+
+class Transfer(object):
+'''Controller for attended transfer test
+
+This contains all the methods for advancing the test, such as placing calls
+and performing transfers. It also has several state variables that help to
+determine the proper timing for performing actions.
+'''
+
+def __init__(self, test_object, accounts):
+super(Transfer, self).__init__()
+self.ami = test_object.ami[0]
+self.ami.registerEvent('BridgeCreate', self.bridge_create)
+self.ami.registerEvent('BridgeEnter', self.bridge_enter)
+
+# bridge1 bridges Alice and Bob
+self.bridge1 = BridgeState()
+# bridge2 bridges Alice and Carol
+self.bridge2 = BridgeState()
+
+self.bob_call_answered = False
+self.carol_call_answered = False
+
+bob = accounts.get('bob').account
+bob.set_callback(TransferAccountCallback(bob))
+
+carol = accounts.get('carol').account
+carol.set_callback(TransferAccountCallback(carol))
+
+self.alice = accounts.get('alice').account
+self.call_to_bob = None
[asterisk-dev] Change in testsuite[master]: Rewrite sip_attended_transfer test to stop failing.
Matt Jordan has posted comments on this change. Change subject: Rewrite sip_attended_transfer test to stop failing. .. Patch Set 3: Code-Review+2 Verified+1 -- To view, visit https://gerrit.asterisk.org/19 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1676801d90bcafc28ba25e8b6889f40ab08cc90e Gerrit-PatchSet: 3 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Ashley Sanders asand...@digium.com Gerrit-Reviewer: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Memory Debugging Improvements
Matt Jordan has posted comments on this change. Change subject: Memory Debugging Improvements .. Patch Set 3: Barring Ashley's finding, this looks good to go. Once that patch set is up, I'll +1 it. -- To view, visit https://gerrit.asterisk.org/15 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I21634673508a01eea1f489c751d3cf75ea55cf06 Gerrit-PatchSet: 3 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Corey Farrell g...@cfware.com Gerrit-Reviewer: Ashley Sanders asand...@digium.com Gerrit-Reviewer: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: rest_api/channels/snoop_spy: Stop test on bridge destruction
Matt Jordan has uploaded a new change for review. https://gerrit.asterisk.org/21 Change subject: rest_api/channels/snoop_spy: Stop test on bridge destruction .. rest_api/channels/snoop_spy: Stop test on bridge destruction The snoop_spy test is currently bouncing on the CI build agents. This is due to a race condition in the test: * The test wants to verify that three StasisEnd events have occurred. When all events have occurred, it will destroy the bridge to clean up resources. * At the same time, the twisted reactor will be stopped by the test object when the Local channel it spawned is hung up. This causes a race condition, as the Local channel hangup is not ordered with respect to the StasisEnd events received by the test. As a result, the WebSocket connection may be broken before all StasisEnd events have been received. This patch fixes this by: 1. Instructing the test object to not stop the test when the Local channel has been destroyed. 2. Introducing a new instance of a pluggable module to watch for the 'BridgeDestroyed' event. Since there is only one bridge in the test being destroyed at the very end of the test, this is easy to watch for. 3. When said event is received, stop the test. This guarantees that the test will finish to completion, and all resources are reclaimed prior to stopping Asterisk. Change-Id: I373981f81ca455743bbf2371f07b380d013cd12b --- M tests/rest_api/channels/snoop_spy/test-config.yaml 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/21/21/1 diff --git a/tests/rest_api/channels/snoop_spy/test-config.yaml b/tests/rest_api/channels/snoop_spy/test-config.yaml index 2d9283a..10150d3 100644 --- a/tests/rest_api/channels/snoop_spy/test-config.yaml +++ b/tests/rest_api/channels/snoop_spy/test-config.yaml @@ -14,15 +14,28 @@ - config-section: ami-uut typename: 'ami.AMIEventModule' +- +config-section: ari-test-stopper +typename: pluggable_modules.EventActionModule test-object-config: reactor-timeout: 60 +stop-on-end: False test-iterations: - - channel: Local/s@default application: Playback data: demo-congrats + +ari-test-stopper: +- +ari-events: +match: +type: BridgeDestroyed +application: testsuite +stop_test: + ami-uut: - type: 'headermatch' -- To view, visit https://gerrit.asterisk.org/21 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I373981f81ca455743bbf2371f07b380d013cd12b Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Memory Debugging Improvements
Matt Jordan has posted comments on this change. Change subject: Memory Debugging Improvements .. Patch Set 2: (2 comments) https://gerrit.asterisk.org/#/c/15/2/contrib/valgrind/text-summary.xsl File contrib/valgrind/text-summary.xsl: Line 4: xsl:output method=text omit-xml-declaration=yes indent=no/ Looking at this XSLT, it is frustrating to have to use XML comments to properly format the stylesheet. That feels awkward. This is clearly due to outputting this as text. While some of this could probably be eliminated by using concat(), places where you have conditional expressions are going to need 'help' to be formatted properly - so long as the output is text. Why not output this as HTML? Having an HTML report of memory errors isn't a bad way to represent the output, and wouldn't necessitate the comment indentation. It also offers lots of advantages in terms of formatting the output, grouping it, linking it, etc. https://gerrit.asterisk.org/#/c/15/2/lib/python/asterisk/asterisk.py File lib/python/asterisk/asterisk.py: Line 363: suppression_file = 'contrib/valgrind/suppressions.txt' Asterisk also comes with a suppressions file. Is there a reason to not use that, or at least let the user specify the suppressions file to use? -- To view, visit https://gerrit.asterisk.org/15 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I21634673508a01eea1f489c751d3cf75ea55cf06 Gerrit-PatchSet: 2 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: Yes -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: PJSIP: Added test to ensure retransmissions are not handled.
Matt Jordan has posted comments on this change. Change subject: PJSIP: Added test to ensure retransmissions are not handled. .. Patch Set 1: (2 comments) https://gerrit.asterisk.org/#/c/14/1//COMMIT_MSG Commit Message: Line 16: I'd go ahead and put the ASTERISK issue number here, along with the reporter. https://gerrit.asterisk.org/#/c/14/1/tests/channels/pjsip/message/message_retrans/test-config.yaml File tests/channels/pjsip/message/message_retrans/test-config.yaml: Line 2: summary: 'Test that Asterisk does not handle MESSAGE retransmissions' 'does not handle' sounds like we screw it up. Maybe 'does not process'? -- To view, visit https://gerrit.asterisk.org/14 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I524a3eb1cde4489d0ff9866913ae1be318c72115 Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: Yes -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Testsuite: Test for res_pjsip_config_wizard auto-create hints
Matt Jordan has submitted this change and it was merged.
Change subject: Testsuite: Test for res_pjsip_config_wizard auto-create hints
..
Testsuite: Test for res_pjsip_config_wizard auto-create hints
This test uses ListDialPlan to check that if the hint_ parameters
are added to a config wizard, the hints are properly created.
Change-Id: I65edbb67fd2ae7008832db87365229bb2ab55eb6
---
A tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip.conf
A tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf
A tests/channels/pjsip/config_wizard/hints/test-config.yaml
M tests/channels/pjsip/config_wizard/tests.yaml
4 files changed, 83 insertions(+), 0 deletions(-)
Approvals:
Matt Jordan: Looks good to me, approved; Verified
Jared K. Smith: Looks good to me, but someone else must approve
diff --git a/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip.conf
b/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip.conf
new file mode 100644
index 000..3ab72e2
--- /dev/null
+++ b/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip.conf
@@ -0,0 +1,5 @@
+[ipv4]
+type=transport
+protocol=udp
+bind=0.0.0.0
+
diff --git
a/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf
b/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf
new file mode 100644
index 000..96b72d8
--- /dev/null
+++ b/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf
@@ -0,0 +1,14 @@
+[phone1]
+type = wizard
+accepts_auth = yes
+accepts_registrations = yes
+transport = ipv4
+endpoint/from_domain = test_domain
+aor/max_contacts = 7
+inbound_auth/username = testuser
+inbound_auth/password = testpass
+endpoint/direct_media = no
+hint_context = default_hints
+hint_exten = 9090
+hint_application = Dial(${HINT}/)
+
diff --git a/tests/channels/pjsip/config_wizard/hints/test-config.yaml
b/tests/channels/pjsip/config_wizard/hints/test-config.yaml
new file mode 100644
index 000..7c76cba
--- /dev/null
+++ b/tests/channels/pjsip/config_wizard/hints/test-config.yaml
@@ -0,0 +1,63 @@
+testinfo:
+summary: 'Test PJSIP Config Wizard Phone Hints'
+description: |
+Tests the PJSIP Config Wizard to make sure the
+hints are properly created.
+
+properties:
+minversion: '13.3.0'
+dependencies:
+- asterisk : 'res_pjsip'
+- asterisk : 'res_pjsip_config_wizard'
+
+tags:
+- pjsip
+
+test-modules:
+# allow test_runner to find and run the local test
+add-test-to-search-path: 'True'
+add-relative-to-search-path: ['../']
+test-object:
+config-section: object-config
+typename: 'AMISendTest.AMISendTest'
+modules:
+-
+config-section: 'ami-config'
+typename: 'ami.AMIEventModule'
+
+object-config:
+reactor-timeout: 15
+ACTION: { Action: ShowDialPlan, ActionID: 12345, Context:
default_hints, Extension: 9090 }
+
+ami-config:
+-
+type: 'headermatch'
+conditions:
+match:
+Event: 'ListDialplan'
+Priority: 'hint'
+requirements:
+match:
+ActionID: '12345'
+Context: 'default_hints'
+Extension: '9090'
+Priority: 'hint'
+Application: 'PJSIP/phone1'
+Registrar: 'res_pjsip_config_wizard'
+count: 1
+-
+type: 'headermatch'
+conditions:
+match:
+Event: 'ListDialplan'
+Priority: '1'
+requirements:
+match:
+ActionID: '12345'
+Context: 'default_hints'
+Extension: '9090'
+Priority: '1'
+Application: 'Dial'
+AppData: '\${HINT}/'
+Registrar: 'res_pjsip_config_wizard'
+count: 1
diff --git a/tests/channels/pjsip/config_wizard/tests.yaml
b/tests/channels/pjsip/config_wizard/tests.yaml
index 8677e64..188afd5 100644
--- a/tests/channels/pjsip/config_wizard/tests.yaml
+++ b/tests/channels/pjsip/config_wizard/tests.yaml
@@ -1,5 +1,6 @@
# Enter tests here in the order they should be considered for execution:
tests:
- test: 'phone'
+- test: 'hints'
- test: 'trunk'
- test: 'registration'
--
To view, visit https://gerrit.asterisk.org/10
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I65edbb67fd2ae7008832db87365229bb2ab55eb6
Gerrit-PatchSet: 2
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: George Joseph george.jos...@fairview5.com
Gerrit-Reviewer: Jared K. Smith jaredsm...@jaredsmith.net
Gerrit-Reviewer: Matt Jordan mjor...@digium.com
--
[asterisk-dev] Change in testsuite[master]: Testsuite: Test for res_pjsip_config_wizard auto-create hints
Matt Jordan has posted comments on this change. Change subject: Testsuite: Test for res_pjsip_config_wizard auto-create hints .. Patch Set 2: Code-Review+2 Verified+1 -- To view, visit https://gerrit.asterisk.org/10 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I65edbb67fd2ae7008832db87365229bb2ab55eb6 Gerrit-PatchSet: 2 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: George Joseph george.jos...@fairview5.com Gerrit-Reviewer: Jared K. Smith jaredsm...@jaredsmith.net Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: PJSIP: Added test to ensure retransmissions are not handled ...
Matt Jordan has posted comments on this change. Change subject: PJSIP: Added test to ensure retransmissions are not handled twice. .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.asterisk.org/14 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I524a3eb1cde4489d0ff9866913ae1be318c72115 Gerrit-PatchSet: 3 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: PJSIP: Added test to ensure retransmissions are not handled ...
Matt Jordan has posted comments on this change. Change subject: PJSIP: Added test to ensure retransmissions are not handled twice. .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.asterisk.org/14 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I524a3eb1cde4489d0ff9866913ae1be318c72115 Gerrit-PatchSet: 3 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: PJSIP: Added test to ensure retransmissions are not handled ...
Matt Jordan has submitted this change and it was merged.
Change subject: PJSIP: Added test to ensure retransmissions are not handled
twice.
..
PJSIP: Added test to ensure retransmissions are not handled twice.
In this test, a SIPp scenario sends the exact same MESSAGE request
to Asterisk twice. The test ensures that the dialplan is only called
into a single time.
Without the patch from https://reviewboard.asterisk.org/r/4532/ , this
test fails because the UserEvent in the dialplan is sent twice. With
that patch, this test succeeds.
ASTERSIK-24920
Reported by Mark Michelson
Change-Id: I524a3eb1cde4489d0ff9866913ae1be318c72115
---
A tests/channels/pjsip/message/message_retrans/configs/ast1/extensions.conf
A tests/channels/pjsip/message/message_retrans/configs/ast1/pjsip.conf
A tests/channels/pjsip/message/message_retrans/sipp/message_retrans.xml
A tests/channels/pjsip/message/message_retrans/test-config.yaml
M tests/channels/pjsip/message/tests.yaml
5 files changed, 94 insertions(+), 0 deletions(-)
Approvals:
Matt Jordan: Looks good to me, approved; Verified
diff --git
a/tests/channels/pjsip/message/message_retrans/configs/ast1/extensions.conf
b/tests/channels/pjsip/message/message_retrans/configs/ast1/extensions.conf
new file mode 100644
index 000..b5b6eec
--- /dev/null
+++ b/tests/channels/pjsip/message/message_retrans/configs/ast1/extensions.conf
@@ -0,0 +1,3 @@
+[default]
+exten = test,1,NoOp()
+same = n,UserEvent(MessageHandled)
diff --git
a/tests/channels/pjsip/message/message_retrans/configs/ast1/pjsip.conf
b/tests/channels/pjsip/message/message_retrans/configs/ast1/pjsip.conf
new file mode 100644
index 000..5f335b2
--- /dev/null
+++ b/tests/channels/pjsip/message/message_retrans/configs/ast1/pjsip.conf
@@ -0,0 +1,8 @@
+[main-transport]
+type = transport
+bind = 127.0.0.1:5060
+protocol = udp
+
+[sipp]
+type = endpoint
+context = default
diff --git
a/tests/channels/pjsip/message/message_retrans/sipp/message_retrans.xml
b/tests/channels/pjsip/message/message_retrans/sipp/message_retrans.xml
new file mode 100644
index 000..af12f97
--- /dev/null
+++ b/tests/channels/pjsip/message/message_retrans/sipp/message_retrans.xml
@@ -0,0 +1,42 @@
+?xml version=1.0 encoding=ISO-8859-1 ?
+
+scenario name=Basic MESSAGE send and receive
+ send
+![CDATA[
+
+ MESSAGE sip:test@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=z9hG4bK-24096-1-0
+ From: user sip:sipp@[local_ip]:[local_port];tag=1
+ To: sip:test@[remote_ip]:[remote_port]
+ Call-ID: 1234567890
+ CSeq: 1 MESSAGE
+ Max-Forwards: 70
+ Expires: 3600
+ Content-Type: text/plain
+ Content-Length: 18
+
+ Watson, come here.
+
+]]
+ /send
+
+ send
+![CDATA[
+
+ MESSAGE sip:test@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=z9hG4bK-24096-1-0
+ From: user sip:sipp@[local_ip]:[local_port];tag=1
+ To: sip:test@[remote_ip]:[remote_port]
+ Call-ID: 1234567890
+ CSeq: 1 MESSAGE
+ Max-Forwards: 70
+ Expires: 3600
+ Content-Type: text/plain
+ Content-Length: 18
+
+ Watson, come here.
+
+]]
+ /send
+
+/scenario
diff --git a/tests/channels/pjsip/message/message_retrans/test-config.yaml
b/tests/channels/pjsip/message/message_retrans/test-config.yaml
new file mode 100644
index 000..e1015af
--- /dev/null
+++ b/tests/channels/pjsip/message/message_retrans/test-config.yaml
@@ -0,0 +1,40 @@
+testinfo:
+summary: 'Test that Asterisk does not handle MESSAGE retransmissions'
+description: |
+'A SIPp scenario sends the same SIP MESSAGE request twice. The test
ensures that
+Asterisk only attempts to process one of them. If both MESSAGEs reach
the dialplan,
+the test fails.'
+
+properties:
+minversion: '13.4.0'
+dependencies:
+- app: 'sipp'
+- asterisk: 'res_pjsip'
+- asterisk: 'res_pjsip_messaging'
+tags:
+- pjsip
+
+test-modules:
+test-object:
+config-section: test-object-config
+typename: 'sipp.SIPpTestCase'
+modules:
+-
+config-section: 'ami-config'
+typename: 'ami.AMIEventModule'
+
+
+test-object-config:
+test-iterations:
+-
+scenarios:
+- { 'key-args': { 'scenario': 'message_retrans.xml', '-p':
'5061' } }
+
+ami-config:
+-
+type: 'headermatch'
+conditions:
+match:
+Event: 'UserEvent'
+UserEvent: 'MessageHandled'
+count: '1'
diff --git a/tests/channels/pjsip/message/tests.yaml
b/tests/channels/pjsip/message/tests.yaml
index de6741a..faf4e86 100644
--- a/tests/channels/pjsip/message/tests.yaml
+++ b/tests/channels/pjsip/message/tests.yaml
@@ -7,3 +7,4 @@
- test: 'message_cust_hdr'
- test: 'message_in_dialog'
-
[asterisk-dev] Change in testsuite[master]: tests/rest_api/channels: Add a channel hold intercept test
Matt Jordan has uploaded a new change for review.
https://gerrit.asterisk.org/16
Change subject: tests/rest_api/channels: Add a channel hold intercept test
..
tests/rest_api/channels: Add a channel hold intercept test
This test verifies that a channel that initiates a call hold with the
HOLD_INTERCEPT function enabled on it will have the hold frame intercepte
and turned into an event for ARI clients.
A Local channel enters the Stasis application, and the HOLD_INTERCEPT function
is placed on the channel. A POST /hold operation is then used to simulate a
call hold on the channel. The test verifies that a ChannelHold event is raised
with the channel initating the hold. A DELETE /hold operation is then used, and
a ChannelUnhold event is raised with the channel initiating the unhold.
ASTERISK-24922
Reported by: Matt Jordan
Change-Id: If8bdbc74e0789d0c13ffbc5cb0c852f5f3a04012
---
A tests/rest_api/channels/hold/hold_intercept/configs/ast1/extensions.conf
A tests/rest_api/channels/hold/hold_intercept/hold_intercept.py
A tests/rest_api/channels/hold/hold_intercept/test-config.yaml
A tests/rest_api/channels/hold/tests.yaml
M tests/rest_api/channels/tests.yaml
5 files changed, 126 insertions(+), 0 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/16/16/1
diff --git
a/tests/rest_api/channels/hold/hold_intercept/configs/ast1/extensions.conf
b/tests/rest_api/channels/hold/hold_intercept/configs/ast1/extensions.conf
new file mode 100644
index 000..aa88cf3
--- /dev/null
+++ b/tests/rest_api/channels/hold/hold_intercept/configs/ast1/extensions.conf
@@ -0,0 +1,6 @@
+[default]
+
+exten = s,1,NoOp()
+ same = n,Answer()
+ same = n,Stasis(testsuite)
+ same = n,Hangup()
diff --git a/tests/rest_api/channels/hold/hold_intercept/hold_intercept.py
b/tests/rest_api/channels/hold/hold_intercept/hold_intercept.py
new file mode 100644
index 000..d738c5f
--- /dev/null
+++ b/tests/rest_api/channels/hold/hold_intercept/hold_intercept.py
@@ -0,0 +1,40 @@
+
+Copyright (C) 2015, Digium, Inc.
+Matt Jordan mjor...@digium.com
+
+This program is free software, distributed under the terms of
+the GNU General Public License Version 2.
+
+
+import logging
+
+LOGGER = logging.getLogger(__name__)
+
+CHANNEL_ID = None
+
+
+def on_start(ari, event, test_object):
+global CHANNEL_ID
+LOGGER.debug(on_start(%r) % event)
+
+CHANNEL_ID = event['channel']['id']
+
+ari.post('channels', CHANNEL_ID, 'variable',
+ variable='HOLD_INTERCEPT(set)')
+
+ari.post('channels', CHANNEL_ID, 'hold')
+return True
+
+
+def on_hold(ari, event, test_object):
+LOGGER.debug(on_hold(%r) % event)
+
+ari.delete('channels', CHANNEL_ID, 'hold')
+return True
+
+
+def on_unhold(ari, event, test_object):
+LOGGER.debug(on_unhold(%r) % event)
+
+ari.delete('channels', CHANNEL_ID)
+return True
diff --git a/tests/rest_api/channels/hold/hold_intercept/test-config.yaml
b/tests/rest_api/channels/hold/hold_intercept/test-config.yaml
new file mode 100644
index 000..94bcf1e
--- /dev/null
+++ b/tests/rest_api/channels/hold/hold_intercept/test-config.yaml
@@ -0,0 +1,77 @@
+testinfo:
+summary: Verify that Hold can be intercepted
+description: |
+This test verifies that a channel that initiates a call hold
+with the HOLD_INTERCEPT function enabled on it will have the
+hold frame intercepted and turned into an event for ARI clients.
+A Local channel enters the Stasis application, and the HOLD_INTERCEPT
+function is placed on the channel. A POST /hold operation is then
+used to simulate a call hold on the channel. The test verifies
+that a ChannelHold event is raised with the channel initating
+the hold. A DELETE /hold operation is then used, and a ChannelUnhold
+event is raised with the channel initiating the unhold.
+
+test-modules:
+add-test-to-search-path: True
+test-object:
+config-section: test-object-config
+typename: 'ari.AriTestObject'
+modules:
+-
+config-section: ari-config
+typename: ari.WebSocketEventModule
+
+test-object-config:
+apps: testsuite
+
+ari-config:
+apps: testsuite
+events:
+-
+conditions:
+match:
+type: StasisStart
+application: testsuite
+args: []
+count: 1
+callback:
+module: hold_intercept
+method: on_start
+-
+conditions:
+match:
+type: ChannelHold
+application: testsuite
+initiator: 1
+channel:
+name: 'Local/s@default-.*'
+count: 1
+callback:
+module: hold_intercept
+method: on_hold
[asterisk-dev] Change in testsuite[master]: tests/rest_api/channels: Add a channel hold intercept test
Matt Jordan has uploaded a new patch set (#2). Change subject: tests/rest_api/channels: Add a channel hold intercept test .. tests/rest_api/channels: Add a channel hold intercept test This test verifies that a channel that initiates a call hold with the HOLD_INTERCEPT function enabled on it will have the hold frame intercepte and turned into an event for ARI clients. A Local channel enters the Stasis application, and the HOLD_INTERCEPT function is placed on the channel. A POST /hold operation is then used to simulate a call hold on the channel. The test verifies that a ChannelHold event is raised with the channel initating the hold. A DELETE /hold operation is then used, and a ChannelUnhold event is raised with the channel initiating the unhold. ASTERISK-24922 Reported by: Matt Jordan Change-Id: If8bdbc74e0789d0c13ffbc5cb0c852f5f3a04012 --- A tests/rest_api/channels/hold/hold_intercept/configs/ast1/extensions.conf A tests/rest_api/channels/hold/hold_intercept/hold_intercept.py A tests/rest_api/channels/hold/hold_intercept/test-config.yaml A tests/rest_api/channels/hold/tests.yaml M tests/rest_api/channels/tests.yaml 5 files changed, 124 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/16/16/2 -- To view, visit https://gerrit.asterisk.org/16 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If8bdbc74e0789d0c13ffbc5cb0c852f5f3a04012 Gerrit-PatchSet: 2 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in repotools[master]: Add web proxy support to commit_msg.py
Matt Jordan has submitted this change and it was merged.
Change subject: Add web proxy support to commit_msg.py
..
Add web proxy support to commit_msg.py
This patch allows the commit_msg.py script to connect to the issue
tracker from behind a web proxy in order to get the data it needs
to create the commit message template.
Change-Id: Ie71ccb85e09cce005847ce9bf70c603fbee3d58a
---
M commit_msg.py
1 file changed, 20 insertions(+), 15 deletions(-)
Approvals:
Mark Michelson: Looks good to me, but someone else must approve
Matt Jordan: Looks good to me, approved; Verified
Jared K. Smith: Looks good to me, but someone else must approve
diff --git a/commit_msg.py b/commit_msg.py
index f9b8849..622f006 100755
--- a/commit_msg.py
+++ b/commit_msg.py
@@ -9,7 +9,7 @@
- Add patch license number when available via REST
-from httplib import HTTPSConnection
+from urllib2 import Request, urlopen, URLError
from optparse import OptionParser
import sys, os
import json
@@ -23,16 +23,18 @@
if not args:
print sys.stderr, Requres a JIRA issue number
sys.exit(1)
-
-con = HTTPSConnection('issues.asterisk.org')
-con.request(GET, /jira/rest/api/latest/issue/%s/ % (args[0],))
-res = con.getresponse()
-data = json.loads(res.read())
-
-if res.status != 200:
-print sys.stderr, res.status, res.reason
-print sys.stderr, json.dumps(data, indent=4)
-sys.exit(1)
+try:
+req = Request(https://issues.asterisk.org/jira/rest/api/latest/issue/%s;
% (args[0],))
+res = urlopen(req)
+except URLError as e:
+if hasattr(e, 'reason'):
+print sys.stderr, 'Reason: ', e.reason
+sys.exit(1)
+elif hasattr(e, 'code'):
+print sys.stderr, 'Error code: ', e.code
+sys.exit(1)
+else:
+data = json.loads(res.read())
print \nDoes this commit close issue %s? (y/n) % (args[0],),
if raw_input()[0] in ['y', 'Y']:
@@ -59,11 +61,14 @@
for x in data['fields']['attachment']:
licenseid = 0
try:
-con.request(GET, /jira/rest/api/2/attachment/%s/ % x['id'])
-res = con.getresponse()
+req =
Request(https://issues.asterisk.org/jira/rest/api/2/attachment/%s/; % x['id'])
+res = urlopen(req)
licenseid = json.loads(res.read())['properties']['license']
-except:
-'''Supress Exception'''
+except URLError as e:
+if hasattr(e, 'reason'):
+print sys.stderr, 'Reason: ', e.reason
+elif hasattr(e, 'code'):
+print sys.stderr, 'Error code: ', e.code
if licenseid != 2:
attachments.append(%s submitted by %s (license %d) %
(x['filename'], x['author']['name'], licenseid))
except:
--
To view, visit https://gerrit.asterisk.org/13
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie71ccb85e09cce005847ce9bf70c603fbee3d58a
Gerrit-PatchSet: 3
Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-Owner: Michael L. Young elgueromexic...@gmail.com
Gerrit-Reviewer: Jared K. Smith jaredsm...@jaredsmith.net
Gerrit-Reviewer: Mark Michelson mmichel...@digium.com
Gerrit-Reviewer: Matt Jordan mjor...@digium.com
--
_
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in repotools[master]: Add web proxy support to commit_msg.py
Matt Jordan has posted comments on this change. Change subject: Add web proxy support to commit_msg.py .. Patch Set 3: Code-Review+2 Verified+1 -- To view, visit https://gerrit.asterisk.org/13 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie71ccb85e09cce005847ce9bf70c603fbee3d58a Gerrit-PatchSet: 3 Gerrit-Project: repotools Gerrit-Branch: master Gerrit-Owner: Michael L. Young elgueromexic...@gmail.com Gerrit-Reviewer: Jared K. Smith jaredsm...@jaredsmith.net Gerrit-Reviewer: Mark Michelson mmichel...@digium.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: tests/rest_api/channels/hold: Add a default Hold action test
Matt Jordan has uploaded a new change for review.
https://gerrit.asterisk.org/17
Change subject: tests/rest_api/channels/hold: Add a default Hold action test
..
tests/rest_api/channels/hold: Add a default Hold action test
This test verifies that a channel that initiates a call hold will have the
Hold event raised for it, and that a channel that removes a call hold will
have an Unhold event raised for it.
The test puts two Local channels into a Bridge together. When both channels
are in a bridge, an ARI POST /hold operation is performed on the first
channel. When the Hold event is received, an ARI DELETE /hold operation is
performed on the same channel. When the Unhold event is received, the
channels are removed from the bridge and hung up, and the bridge is destroyed.
ASTERISK-24922
Reported by: Matt Jordan
Change-Id: I9786cb0829e39b33a8dbc130e53fd15a1b5e0d68
---
A tests/rest_api/channels/hold/hold_action/configs/ast1/extensions.conf
A tests/rest_api/channels/hold/hold_action/hold_action.py
A tests/rest_api/channels/hold/hold_action/test-config.yaml
M tests/rest_api/channels/hold/tests.yaml
4 files changed, 208 insertions(+), 0 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/17/17/1
diff --git
a/tests/rest_api/channels/hold/hold_action/configs/ast1/extensions.conf
b/tests/rest_api/channels/hold/hold_action/configs/ast1/extensions.conf
new file mode 100644
index 000..df8f90c
--- /dev/null
+++ b/tests/rest_api/channels/hold/hold_action/configs/ast1/extensions.conf
@@ -0,0 +1,14 @@
+[default]
+
+exten = s,1,NoOp()
+ same = n,Answer()
+ same = n,Stasis(testsuite)
+ same = n,Hangup()
+
+exten = second,1,NoOp()
+ same = n,Answer()
+ same = n,Stasis(testsuite,second)
+ same = n,Hangup()
+
+exten = echo,1,NoOp()
+ same = n,Echo()
diff --git a/tests/rest_api/channels/hold/hold_action/hold_action.py
b/tests/rest_api/channels/hold/hold_action/hold_action.py
new file mode 100644
index 000..202fcea
--- /dev/null
+++ b/tests/rest_api/channels/hold/hold_action/hold_action.py
@@ -0,0 +1,92 @@
+'''
+Copyright (C) 2015, Digium, Inc.
+Matt Jordan mjor...@digium.com
+
+This program is free software, distributed under the terms of
+the GNU General Public License Version 2.
+'''
+
+import uuid
+import logging
+
+LOGGER = logging.getLogger(__name__)
+
+
+class TestTracker(object):
+Object that keeps track of the test
+
+def __init__(self):
+self.channel_one = None
+self.channel_two = None
+self.bridge = None
+
+TEST = TestTracker()
+
+
+def on_first_start(ari, event, test_object):
+global TEST
+LOGGER.debug(on_start(%r) % event)
+
+TEST.channel_one = event['channel']['id']
+
+second_channel_id = str(uuid.uuid4())
+ari.post('channels', second_channel_id, endpoint='Local/second@default',
+ extension='echo', context='default', priority=1)
+
+return True
+
+
+def on_second_start(ari, event, test_object):
+global TEST
+LOGGER.debug(on_start(%r) % event)
+
+TEST.channel_two = event['channel']['id']
+
+TEST.bridge = ari.post('bridges', 'test-bridge',
+ type='mixing,dtmf_events').json()['id']
+
+ari.post('bridges', TEST.bridge, 'addChannel',
+ channel='%s,%s' % (TEST.channel_one, TEST.channel_two))
+return True
+
+
+def on_entered_bridge(ari, event, test_object):
+global TEST
+LOGGER.debug(on_entered_bridge(%r) % event)
+
+bridge = event['bridge']
+if len(bridge['channels']) == 2:
+ari.post('channels', TEST.channel_one, 'hold')
+return True
+
+
+def on_hold(ari, event, test_object):
+global TEST
+LOGGER.debug(on_hold(%r) % event)
+
+ari.delete('channels', TEST.channel_one, 'hold')
+return True
+
+
+def on_unhold(ari, event, test_object):
+global TEST
+LOGGER.debug(on_unhold(%r) % event)
+
+ari.post('bridges', TEST.bridge, 'removeChannel', channel=TEST.channel_one)
+ari.post('bridges', TEST.bridge, 'removeChannel', channel=TEST.channel_two)
+
+test_object.set_passed(True)
+return True
+
+
+def on_left_bridge(ari, event, test_object):
+global TEST
+LOGGER.debug('on_left_bridge(%r)' % event)
+
+bridge = event['bridge']
+if len(bridge['channels']) == 0:
+ari.delete('channels', TEST.channel_one)
+ari.delete('channels', TEST.channel_two)
+ari.delete('bridges', TEST.bridge)
+
+return True
diff --git a/tests/rest_api/channels/hold/hold_action/test-config.yaml
b/tests/rest_api/channels/hold/hold_action/test-config.yaml
new file mode 100644
index 000..769afaf
--- /dev/null
+++ b/tests/rest_api/channels/hold/hold_action/test-config.yaml
@@ -0,0 +1,101 @@
+testinfo:
+summary: Verify that Hold can be posted/deleted on a channel
+description: |
+This test verifies that a channel that initiates a call hold
+will have the
[asterisk-dev] Change in repotools[master]: Ignore JIRA uploads with license #2.
Matt Jordan has submitted this change and it was merged. Change subject: Ignore JIRA uploads with license #2. .. Ignore JIRA uploads with license #2. License #2 is used for files that are not patches or documentation. Ignore any files with this license since they are not covered by a CLA. Change-Id: Ia76d2fe7e7357901f0e38b158b42f4323ccd120f --- M commit_msg.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Michael L. Young: Looks good to me, but someone else must approve Matt Jordan: Looks good to me, approved; Verified diff --git a/commit_msg.py b/commit_msg.py index e342d47..f9b8849 100755 --- a/commit_msg.py +++ b/commit_msg.py @@ -64,7 +64,8 @@ licenseid = json.loads(res.read())['properties']['license'] except: '''Supress Exception''' -attachments.append(%s submitted by %s (license %d) % (x['filename'], x['author']['name'], licenseid)) +if licenseid != 2: +attachments.append(%s submitted by %s (license %d) % (x['filename'], x['author']['name'], licenseid)) except: attachments = None patches = None -- To view, visit https://gerrit.asterisk.org/12 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia76d2fe7e7357901f0e38b158b42f4323ccd120f Gerrit-PatchSet: 1 Gerrit-Project: repotools Gerrit-Branch: master Gerrit-Owner: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Michael L. Young elgueromexic...@gmail.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Fixes related to testsuite GIT migration.
Matt Jordan has posted comments on this change. Change subject: Fixes related to testsuite GIT migration. .. Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.asterisk.org/11 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic67a6b4e3c55fd297a70fdbdf7c0aa7737c7aeb6 Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Corey Farrell g...@cfware.com Gerrit-Reviewer: George Joseph george.jos...@fairview5.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in repotools[master]: Ignore JIRA uploads with license #2.
Matt Jordan has posted comments on this change. Change subject: Ignore JIRA uploads with license #2. .. Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.asterisk.org/12 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia76d2fe7e7357901f0e38b158b42f4323ccd120f Gerrit-PatchSet: 1 Gerrit-Project: repotools Gerrit-Branch: master Gerrit-Owner: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Michael L. Young elgueromexic...@gmail.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add a .gitreview file for the testsuite
Matt Jordan has uploaded a new change for review. https://gerrit.asterisk.org/7 Change subject: Add a .gitreview file for the testsuite .. Add a .gitreview file for the testsuite This patch adds a .gitreview file so that 'git review' can find the testsuite repo on gerrit.asterisk.org. Change-Id: I34162d2d66cb4f80b918c85fdb55304c43aadb28 --- A .gitreview 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/07/7/1 -- To view, visit https://gerrit.asterisk.org/7 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I34162d2d66cb4f80b918c85fdb55304c43aadb28 Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add .gitignore files
Matt Jordan has uploaded a new change for review. https://gerrit.asterisk.org/8 Change subject: Add .gitignore files .. Add .gitignore files This patch adds .gitignore files to hide artifacts created when building components in the Test Suite or when running the Test Suite. It also includes a .gitignore file for the 'logs' directory, which helps persist the (by default) empty directory. Change-Id: Ibedc56ac80bcb1981b66a6b514cf817f7423f6ec --- A .gitignore A addons/.gitignore A asttest/.gitignore A asttest/lib/lua/.gitignore A asttest/self-tests/.gitignore A asttest/tools/.gitignore A logs/.gitignore 7 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/08/8/1 -- To view, visit https://gerrit.asterisk.org/8 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibedc56ac80bcb1981b66a6b514cf817f7423f6ec Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: channels/pjsip/publish/asterisk_event_db: Add AstDB clusteri...
Matt Jordan has posted comments on this change. Change subject: channels/pjsip/publish/asterisk_event_db: Add AstDB clustering tests .. Patch Set 1: Poke the mailing list. A goof in the config prevented the initial e-mail for this review from going out. -- To view, visit https://gerrit.asterisk.org/9 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibb2928065eb015363d0b3c081f9b324639fc6357 Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add a .gitreview file for the testsuite
Hello Samuel Galarneau, Russell Bryant, I'd like you to reexamine a change. Please visit https://gerrit.asterisk.org/7 to look at the new patch set (#2). Change subject: Add a .gitreview file for the testsuite .. Add a .gitreview file for the testsuite This patch adds a .gitreview file so that 'git review' can find the testsuite repo on gerrit.asterisk.org. Change-Id: I34162d2d66cb4f80b918c85fdb55304c43aadb28 --- A .gitreview 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/07/7/2 -- To view, visit https://gerrit.asterisk.org/7 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I34162d2d66cb4f80b918c85fdb55304c43aadb28 Gerrit-PatchSet: 2 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Russell Bryant russ...@russellbryant.net Gerrit-Reviewer: Samuel Galarneau sgalarn...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add a .gitreview file for the testsuite
Matt Jordan has posted comments on this change. Change subject: Add a .gitreview file for the testsuite .. Patch Set 2: (1 comment) Fixed the micro-nit :-) -- To view, visit https://gerrit.asterisk.org/7 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I34162d2d66cb4f80b918c85fdb55304c43aadb28 Gerrit-PatchSet: 2 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Russell Bryant russ...@russellbryant.net Gerrit-Reviewer: Samuel Galarneau sgalarn...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add a .gitreview file for the testsuite
Matt Jordan has submitted this change and it was merged. Change subject: Add a .gitreview file for the testsuite .. Add a .gitreview file for the testsuite This patch adds a .gitreview file so that 'git review' can find the testsuite repo on gerrit.asterisk.org. Change-Id: I34162d2d66cb4f80b918c85fdb55304c43aadb28 --- A .gitreview 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Samuel Galarneau: Looks good to me, but someone else must approve Matt Jordan: Looks good to me, approved; Verified Russell Bryant: Looks good to me, but someone else must approve Corey Farrell: Looks good to me, but someone else must approve diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..143a8c8 --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=gerrit.asterisk.org +port=29418 +project=testsuite.git -- To view, visit https://gerrit.asterisk.org/7 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I34162d2d66cb4f80b918c85fdb55304c43aadb28 Gerrit-PatchSet: 2 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Russell Bryant russ...@russellbryant.net Gerrit-Reviewer: Samuel Galarneau sgalarn...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add .gitignore files
Matt Jordan has posted comments on this change. Change subject: Add .gitignore files .. Patch Set 1: (3 comments) https://gerrit.asterisk.org/#/c/8/1/.gitignore File .gitignore: Line 3 While we're here can we add /astroot? This is where ./run-local installs A Sure! https://gerrit.asterisk.org/#/c/8/1/asttest/self-tests/.gitignore File asttest/self-tests/.gitignore: Line 1: **/asttest.log Nit-pick - just asttest.log should do. Fixed https://gerrit.asterisk.org/#/c/8/1/logs/.gitignore File logs/.gitignore: Line 1: [^.]* Personally I'd prefer that we instead add /logs to the root .gitignore, hav I think having runtests.py look to see if the logs directory exists and create it if not is a good idea - in which case, this .gitignore should get moved up to the top level. I do think that sort of feels like a separate change from this, so if we want to do it as a separate issue, that'd be fine by me. I'd be happy to write that patch as well, if you don't have time :-) -- To view, visit https://gerrit.asterisk.org/8 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibedc56ac80bcb1981b66a6b514cf817f7423f6ec Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Russell Bryant russ...@russellbryant.net Gerrit-HasComments: Yes -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add .gitignore files
Hello Russell Bryant, Corey Farrell, I'd like you to reexamine a change. Please visit https://gerrit.asterisk.org/8 to look at the new patch set (#2). Change subject: Add .gitignore files .. Add .gitignore files This patch adds .gitignore files to hide artifacts created when building components in the Test Suite or when running the Test Suite. It also includes a .gitignore file for the 'logs' directory, which helps persist the (by default) empty directory. Change-Id: Ibedc56ac80bcb1981b66a6b514cf817f7423f6ec --- A .gitignore A addons/.gitignore A asttest/.gitignore A asttest/lib/lua/.gitignore A asttest/self-tests/.gitignore A asttest/tools/.gitignore A logs/.gitignore 7 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/08/8/2 -- To view, visit https://gerrit.asterisk.org/8 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibedc56ac80bcb1981b66a6b514cf817f7423f6ec Gerrit-PatchSet: 2 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Russell Bryant russ...@russellbryant.net -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add a .gitignore
Matt Jordan has uploaded a new change for review. https://gerrit.asterisk.org/4 Change subject: Add a .gitignore .. Add a .gitignore This patch adds a .gitignore file for the testsuite, mimicking the svn:ignore property that existed in subversion. This includes ignoring all .pyc files, as well as the report generated by the testsuite. Change-Id: If941038b33699ffd8181e3dc24b12899d2518704 --- A .gitignore 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/04/4/1 -- To view, visit https://gerrit.asterisk.org/4 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If941038b33699ffd8181e3dc24b12899d2518704 Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add a .gitreview file
Matt Jordan has uploaded a new change for review. https://gerrit.asterisk.org/5 Change subject: Add a .gitreview file .. Add a .gitreview file This allows 'git review' to find our gerrit server and post changes for us, along with many other nice things. Change-Id: I057f1cb490c6467637b68f235936a96d2a6a5a49 --- A .gitreview 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/05/5/1 -- To view, visit https://gerrit.asterisk.org/5 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I057f1cb490c6467637b68f235936a96d2a6a5a49 Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add a .gitreview file
Matt Jordan has abandoned this change. Change subject: Add a .gitreview file .. Abandoned -- To view, visit https://gerrit.asterisk.org/5 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I057f1cb490c6467637b68f235936a96d2a6a5a49 Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Russell Bryant russ...@russellbryant.net -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add a .gitignore
Matt Jordan has abandoned this change. Change subject: Add a .gitignore .. Abandoned -- To view, visit https://gerrit.asterisk.org/4 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: If941038b33699ffd8181e3dc24b12899d2518704 Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Add a .gitignore
Matt Jordan has posted comments on this change. Change subject: Add a .gitignore .. Patch Set 1: Unfortunately, there were some issues when the repo got made (see the -dev list post about the authors). As such, I'm going to abandon the current reviews and get this thing remade up with the right history. -- To view, visit https://gerrit.asterisk.org/4 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If941038b33699ffd8181e3dc24b12899d2518704 Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in repotools[master]: .gitignore: Add a .gitignore file that mirrors the previous ...
Matt Jordan has posted comments on this change. Change subject: .gitignore: Add a .gitignore file that mirrors the previous svn:ignore .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.asterisk.org/2 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbbafde95752e31af573502e8cac4aebac69e825 Gerrit-PatchSet: 2 Gerrit-Project: repotools Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Russell Bryant russ...@russellbryant.net Gerrit-Reviewer: Samuel Galarneau sgalarn...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in repotools[master]: .gitignore: Add a .gitignore file that mirrors the previous ...
Matt Jordan has submitted this change and it was merged. Change subject: .gitignore: Add a .gitignore file that mirrors the previous svn:ignore .. .gitignore: Add a .gitignore file that mirrors the previous svn:ignore When repotools was in subversion, it ignored several files in its root directory, as well as its subdirectories. This patch mimics those settings in a .gitignore file. Change-Id: Icbbafde95752e31af573502e8cac4aebac69e825 --- A .gitignore 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Samuel Galarneau: Looks good to me, but someone else must approve Matt Jordan: Looks good to me, approved; Verified Corey Farrell: Looks good to me, but someone else must approve -- To view, visit https://gerrit.asterisk.org/2 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbbafde95752e31af573502e8cac4aebac69e825 Gerrit-PatchSet: 2 Gerrit-Project: repotools Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Russell Bryant russ...@russellbryant.net Gerrit-Reviewer: Samuel Galarneau sgalarn...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in repotools[master]: Add .gitreview file
Matt Jordan has posted comments on this change. Change subject: Add .gitreview file .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.asterisk.org/3 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4f78512b9b82001086916f3d33059a0704881de9 Gerrit-PatchSet: 1 Gerrit-Project: repotools Gerrit-Branch: master Gerrit-Owner: Russell Bryant russ...@russellbryant.net Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in repotools[master]: Add .gitreview file
Matt Jordan has submitted this change and it was merged. Change subject: Add .gitreview file .. Add .gitreview file This file tells 'git review' how to contact the gerrit server. Change-Id: I4f78512b9b82001086916f3d33059a0704881de9 --- A .gitreview 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Samuel Galarneau: Looks good to me, but someone else must approve Matt Jordan: Looks good to me, approved; Verified -- To view, visit https://gerrit.asterisk.org/3 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f78512b9b82001086916f3d33059a0704881de9 Gerrit-PatchSet: 1 Gerrit-Project: repotools Gerrit-Branch: master Gerrit-Owner: Russell Bryant russ...@russellbryant.net Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Samuel Galarneau sgalarn...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in repotools[master]: Add .gitreview file
Matt Jordan has posted comments on this change. Change subject: Add .gitreview file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.asterisk.org/3 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4f78512b9b82001086916f3d33059a0704881de9 Gerrit-PatchSet: 1 Gerrit-Project: repotools Gerrit-Branch: master Gerrit-Owner: Russell Bryant russ...@russellbryant.net Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Samuel Galarneau sgalarn...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in repotools[master]: .gitignore: Add a .gitignore file that mirrors the previous ...
Matt Jordan has uploaded a new change for review. https://gerrit.asterisk.org/2 Change subject: .gitignore: Add a .gitignore file that mirrors the previous svn:ignore .. .gitignore: Add a .gitignore file that mirrors the previous svn:ignore When repotools was in subversion, it had the following for its svn:ignore property: *.pyc config.log config.status Makefile This patch mimics those settings in a .gitignore file. Change-Id: Icbbafde95752e31af573502e8cac4aebac69e825 --- A .gitignore 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/repotools refs/changes/02/2/1 -- To view, visit https://gerrit.asterisk.org/2 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icbbafde95752e31af573502e8cac4aebac69e825 Gerrit-PatchSet: 1 Gerrit-Project: repotools Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in repotools[master]: .gitignore: Add a .gitignore file that mirrors the previous ...
Matt Jordan has posted comments on this change. Change subject: .gitignore: Add a .gitignore file that mirrors the previous svn:ignore .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.asterisk.org/2 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icbbafde95752e31af573502e8cac4aebac69e825 Gerrit-PatchSet: 2 Gerrit-Project: repotools Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Corey Farrell g...@cfware.com Gerrit-Reviewer: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Russell Bryant russ...@russellbryant.net Gerrit-Reviewer: Samuel Galarneau sgalarn...@digium.com Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in repotools[master]: .gitignore: Add a .gitignore file that mirrors the previous ...
Hello Samuel Galarneau, Corey Farrell, I'd like you to reexamine a change. Please visit https://gerrit.asterisk.org/2 to look at the new patch set (#2). Change subject: .gitignore: Add a .gitignore file that mirrors the previous svn:ignore .. .gitignore: Add a .gitignore file that mirrors the previous svn:ignore When repotools was in subversion, it ignored several files in its root directory, as well as its subdirectories. This patch mimics those settings in a .gitignore file. Change-Id: Icbbafde95752e31af573502e8cac4aebac69e825 --- A .gitignore 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/repotools refs/changes/02/2/2 -- To view, visit https://gerrit.asterisk.org/2 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icbbafde95752e31af573502e8cac4aebac69e825 Gerrit-PatchSet: 2 Gerrit-Project: repotools Gerrit-Branch: master Gerrit-Owner: Matt Jordan mjor...@digium.com Gerrit-Reviewer: Corey Farrell g...@cfware.com Gerrit-Reviewer: Samuel Galarneau sgalarn...@digium.com -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
