[asterisk-commits] mmichelson: branch mmichelson/phone-testsuite r3166 - in /asterisk/team/mmich...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Mar 29 15:52:15 CDT 2012
Author: mmichelson
Date: Thu Mar 29 15:52:11 2012
New Revision: 3166
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3166
Log:
Get rid of some reactor stoppages and make some comparisons more clear.
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
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=3166&r1=3165&r2=3166
==============================================================================
--- 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 15:52:11 2012
@@ -59,42 +59,35 @@
# Third one is when the subscribption is terminated.
# The final two should have the same values present.
self.num_notifies = self.num_notifies + 1
- if not event.get("state") == "DIGIUM_PRESENCE_SENT":
+ if event.get("state") != "DIGIUM_PRESENCE_SENT":
return
if self.num_notifies > 3:
print "Too many NOTIFYs!"
self.notifyPassed = False
- reactor.stop()
- if self.num_notifies is 1:
- if not event.get("presencestate") == "away":
+ if self.num_notifies == 1:
+ if event.get("presencestate") != "away":
print "Incorrect presencestate value!"
self.notifyPassed = False
- reactor.stop()
- if not event.get("subtype") == "down the hall":
+ if event.get("subtype") != "down the hall":
print "Incorrect presence subtype!"
self.notifyPassed = False
- reactor.stop()
- if not event.get("message") == "Quarterly financial meeting":
+ if event.get("message") != "Quarterly financial meeting":
print "Incorrect presence message!"
self.notifyPassed = False
- reactor.stop()
else:
- if not event.get("presencestate") == "available":
+ if event.get("presencestate") != "available":
print "Incorrect presencestate value!"
self.notifyPassed = False
- reactor.stop()
- if not event.get("subtype") == "":
+ if event.get("subtype") != "":
print "Incorrect presence subtype!"
self.notifyPassed = False
- reactor.stop()
- if not event.get("message") == "":
+ if event.get("message") != "":
print "Incorrect presence message!"
self.notifyPassed = False
- reactor.stop()
- if self.num_notifies is 3:
+ if self.num_notifies == 3:
self.notifyPassed = True
def ami_connect(self, ami):
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=3166&r1=3165&r2=3166
==============================================================================
--- 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 15:52:11 2012
@@ -52,28 +52,24 @@
# Second one is when the subscribption is terminated.
# Both should have the same values present.
self.num_notifies = self.num_notifies + 1
- if not event.get("state") == "DIGIUM_PRESENCE_SENT":
+ if event.get("state") != "DIGIUM_PRESENCE_SENT":
return
if self.num_notifies > 2:
print "Too many NOTIFYs!"
self.notifyPassed = False
- reactor.stop()
- if not event.get("presencestate") == "away":
+ if event.get("presencestate") != "away":
print "Incorrect presencestate value!"
self.notifyPassed = False
- reactor.stop()
- if not event.get("subtype") == "down the hall":
+ if event.get("subtype") != "down the hall":
print "Incorrect presence subtype!"
self.notifyPassed = False
- reactor.stop()
- if not event.get("message") == "Quarterly financial meeting":
+ if event.get("message") != "Quarterly financial meeting":
print "Incorrect presence message!"
self.notifyPassed = False
- reactor.stop()
- if self.num_notifies is 2:
+ if self.num_notifies == 2:
self.notifyPassed = True
def ami_connect(self, ami):
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=3166&r1=3165&r2=3166
==============================================================================
--- 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 15:52:11 2012
@@ -51,7 +51,7 @@
def originateComplete(self, ami, event):
# We successfully set presence, now let's change device state
# so the SIPp test can conclude
- if not event.get("userevent") == "Presence":
+ if event.get("userevent") != "Presence":
return
df = ami.originate(channel = "Local/callbob at default", application
@@ -69,7 +69,7 @@
def inspectPresence(self, ami, event):
# For this test, we expect none of these events.
# If we get any, we fail.
- if not event.get("state") == "DIGIUM_PRESENCE_SENT":
+ if event.get("state") != "DIGIUM_PRESENCE_SENT":
return
self.notifyPassed = False
@@ -77,8 +77,8 @@
def ami_connect(self, ami):
print("AMI CONNECT")
self.ast[ami.id].cli_exec("sip set debug on")
- self.ami[0].registerEvent("TestEvent", self.inspectPresence)
- self.ami[0].registerEvent("UserEvent", self.originateComplete)
+ ami.registerEvent("TestEvent", self.inspectPresence)
+ ami.registerEvent("UserEvent", self.originateComplete)
self.runSippTest()
def run(self):
More information about the asterisk-commits
mailing list