[asterisk-commits] mmichelson: branch mmichelson/phone-testsuite r3169 - /asterisk/team/mmichels...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Mar 29 16:05:34 2012
New Revision: 3169

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3169
Log:
A bit more clearnup.


Modified:
    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/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=3169&r1=3168&r2=3169
==============================================================================
--- 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:05:34 2012
@@ -77,7 +77,7 @@
         # Fourth one is when the subscription is re-terminated.
         # The first two and last 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
 
         print("Got a NOTIFY")
@@ -85,36 +85,29 @@
         if self.num_notifies > 4:
             print "Too many NOTIFYs!"
             self.notifyPassed = False
-            reactor.stop()
 
         if self.num_notifies < 3:
-            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()
         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 4:
+        if self.num_notifies == 4:
             self.notifyPassed = True
 
     def ami_connect(self, ami):