github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-27 19:19:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix changed_status event

Browse source 
Once again only fires when a resource's presence show value changes.
This commit is contained in:
Lance Stout 2011-11-18 13:37:57 -08:00
parent 2de1be188c
commit 22868c3924
3 changed files with 98 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sleekxmpp/basexmpp.py
View file

@ -778,8 +778,6 @@ class BaseXMPP(XMLStream):
not presence['type'] in presence.showtypes:
return
self.event("changed_status", presence)
def exception(self, exception):
"""
Process any uncaught exceptions, notably IqError and

4
sleekxmpp/roster/item.py
View file

@ -345,7 +345,10 @@ class RosterItem(object):
self.xmpp.event('got_online', presence)
if resource not in self.resources:
self.resources[resource] = {}
old_show = self.resources[resource].get('show', None)
self.resources[resource].update(data)
if old_show != presence['show']:
self.xmpp.event('changed_status', presence)
def handle_unavailable(self, presence):
resource = presence['from'].resource
@ -353,6 +356,7 @@ class RosterItem(object):
return
if resource in self.resources:
del self.resources[resource]
self.xmpp.event('changed_status', presence)
if not self.resources:
self.xmpp.event('got_offline', presence)

94
tests/test_stream_presence.py
View file

@ -251,5 +251,99 @@ class TestStreamPresence(SleekTest):
self.assertEqual(events, ptypes,
"Not all events raised: %s" % events)
def test_changed_status(self):
"""Test that the changed_status event is handled properly."""
events = []
self.stream_start()
def changed_status(presence):
events.append(presence['type'])
self.xmpp.add_event_handler('changed_status', changed_status)
self.recv("""
<presence from="user@example.com" to="tester@localhost" />
""")
self.recv("""
<presence from="user@example.com" to="tester@localhost" />
""")
self.recv("""
<presence from="user@example.com" to="tester@localhost">
<show>away</show>
</presence>
""")
self.recv("""
<presence from="user@example.com" to="tester@localhost">
<show>away</show>
</presence>
""")
self.recv("""
<presence from="user@example.com" to="tester@localhost">
<show>dnd</show>
</presence>
""")
self.recv("""
<presence from="user@example.com" to="tester@localhost">
<show>dnd</show>
</presence>
""")
self.recv("""
<presence from="user@example.com" to="tester@localhost">
<show>chat</show>
</presence>
""")
self.recv("""
<presence from="user@example.com" to="tester@localhost">
<show>chat</show>
</presence>
""")
self.recv("""
<presence from="user@example.com" to="tester@localhost">
<show>xa</show>
</presence>
""")
self.recv("""
<presence from="user@example.com" to="tester@localhost">
<show>xa</show>
</presence>
""")
self.recv("""
<presence from="user@example.com"
to="tester@localhost"
type="unavailable" />
""")
self.recv("""
<presence from="user@example.com"
to="tester@localhost"
type="unavailable" />
""")
self.recv("""
<presence from="user@example.com" to="tester@localhost" />
""")
self.recv("""
<presence from="user@example.com" to="tester@localhost" />
""")
time.sleep(0.3)
self.assertEqual(events, ['available', 'away', 'dnd', 'chat',
'xa', 'unavailable', 'available'],
"Changed status events incorrect: %s" % events)
suite = unittest.TestLoader().loadTestsFromTestCase(TestStreamPresence)