[asterisk-commits] mmichelson: branch mmichelson/phone-testsuite r3170 - in /asterisk/team/mmich...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Mar 29 16:27:56 CDT 2012
Author: mmichelson
Date: Thu Mar 29 16:27:52 2012
New Revision: 3170
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3170
Log:
Two final modifications to the tests.
* Change print statements to logger.error()
* Unregister AMI event in the case that notifyPassed is set false. I had noticed
during testing that a failed test could end up passing because the number of
NOTIFYs received is correct.
Modified:
asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/multiple_state_change/run-test
asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/nominal_state_change/run-test
asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/non_digium_state_change/run-test
asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/resubscribe/run-test
Modified: asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/multiple_state_change/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/multiple_state_change/run-test?view=diff&rev=3170&r1=3169&r2=3170
==============================================================================
--- asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/multiple_state_change/run-test (original)
+++ asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/multiple_state_change/run-test Thu Mar 29 16:27:52 2012
@@ -63,42 +63,46 @@
return
if self.num_notifies > 3:
- print "Too many NOTIFYs!"
+ logger.error("Too many NOTIFYs!")
self.notifyPassed = False
if self.num_notifies == 1:
if event.get("presencestate") != "away":
- print "Incorrect presencestate value!"
+ logger.error("Incorrect presencestate value!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if event.get("subtype") != "down the hall":
- print "Incorrect presence subtype!"
+ logger.error("Incorrect presence subtype!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if event.get("message") != "Quarterly financial meeting":
- print "Incorrect presence message!"
+ logger.error("Incorrect presence message!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
else:
if event.get("presencestate") != "available":
- print "Incorrect presencestate value!"
+ logger.error("Incorrect presencestate value!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if event.get("subtype") != "":
- print "Incorrect presence subtype!"
+ logger.error("Incorrect presence subtype!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if event.get("message") != "":
- print "Incorrect presence message!"
+ logger.error("Incorrect presence message!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if self.num_notifies == 3:
self.notifyPassed = True
def ami_connect(self, ami):
- print("AMI CONNECT")
self.ast[ami.id].cli_exec("sip set debug on")
ami.registerEvent("TestEvent", self.inspectPresence)
self.runSippTest()
def run(self):
TestCase.run(self)
- print("TEST RUNNING")
self.create_ami_factory()
def main():
Modified: asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/nominal_state_change/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/nominal_state_change/run-test?view=diff&rev=3170&r1=3169&r2=3170
==============================================================================
--- asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/nominal_state_change/run-test (original)
+++ asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/nominal_state_change/run-test Thu Mar 29 16:27:52 2012
@@ -56,31 +56,33 @@
return
if self.num_notifies > 2:
- print "Too many NOTIFYs!"
+ logger.error("Too many NOTIFYs!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if event.get("presencestate") != "away":
- print "Incorrect presencestate value!"
+ logger.error("Incorrect presencestate value!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if event.get("subtype") != "down the hall":
- print "Incorrect presence subtype!"
+ logger.error("Incorrect presence subtype!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if event.get("message") != "Quarterly financial meeting":
- print "Incorrect presence message!"
+ logger.error("Incorrect presence message!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if self.num_notifies == 2:
self.notifyPassed = True
def ami_connect(self, ami):
- print("AMI CONNECT")
self.ast[ami.id].cli_exec("sip set debug on")
ami.registerEvent("TestEvent", self.inspectPresence)
self.runSippTest()
def run(self):
TestCase.run(self)
- print("TEST RUNNING")
self.create_ami_factory()
def main():
Modified: asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/non_digium_state_change/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/non_digium_state_change/run-test?view=diff&rev=3170&r1=3169&r2=3170
==============================================================================
--- asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/non_digium_state_change/run-test (original)
+++ asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/non_digium_state_change/run-test Thu Mar 29 16:27:52 2012
@@ -72,10 +72,10 @@
if event.get("state") != "DIGIUM_PRESENCE_SENT":
return
+ logger.error("Unexpected Digium Presence NOTIFY received")
self.notifyPassed = False
def ami_connect(self, ami):
- print("AMI CONNECT")
self.ast[ami.id].cli_exec("sip set debug on")
ami.registerEvent("TestEvent", self.inspectPresence)
ami.registerEvent("UserEvent", self.originateComplete)
@@ -83,7 +83,6 @@
def run(self):
TestCase.run(self)
- print("TEST RUNNING")
self.create_ami_factory()
def main():
Modified: asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/resubscribe/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/resubscribe/run-test?view=diff&rev=3170&r1=3169&r2=3170
==============================================================================
--- asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/resubscribe/run-test (original)
+++ asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_custom_presence/resubscribe/run-test Thu Mar 29 16:27:52 2012
@@ -80,45 +80,47 @@
if event.get("state") != "DIGIUM_PRESENCE_SENT":
return
- print("Got a NOTIFY")
-
if self.num_notifies > 4:
- print "Too many NOTIFYs!"
+ logger.error("Too many NOTIFYs!")
self.notifyPassed = False
if self.num_notifies < 3:
if event.get("presencestate") != "away":
- print "Incorrect presencestate value!"
+ logger.error("Incorrect presencestate value!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if event.get("subtype") != "down the hall":
- print "Incorrect presence subtype!"
+ logger.error("Incorrect presence subtype!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if event.get("message") != "Quarterly financial meeting":
- print "Incorrect presence message!"
+ logger.error("Incorrect presence message!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
else:
if event.get("presencestate") != "available":
- print "Incorrect presencestate value!"
+ logger.error("Incorrect presencestate value!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if event.get("subtype") != "":
- print "Incorrect presence subtype!"
+ logger.error("Incorrect presence subtype!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if event.get("message") != "":
- print "Incorrect presence message!"
+ logger.error("Incorrect presence message!")
self.notifyPassed = False
+ ami.unregisterEvent("TestEvent")
if self.num_notifies == 4:
self.notifyPassed = True
def ami_connect(self, ami):
- print("AMI CONNECT")
self.ast[ami.id].cli_exec("sip set debug on")
ami.registerEvent("TestEvent", self.inspectPresence)
self.runSippTest()
def run(self):
TestCase.run(self)
- print("TEST RUNNING")
self.create_ami_factory()
def main():
More information about the asterisk-commits
mailing list