david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert to "probe" presence at initialization instead of "available" presence

Browse Source 
darcs-hash:20080529165602-86b55-7701fdb03780975ae3f0e78935310d6f5ad4080a.gz
This commit is contained in:
David Rousselie
2008-05-29 18:56:02 +02:00
parent 65f3c147af
commit 34c4b137aa
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/jcl/jabber/component.py
View File

@@ -408,11 +408,11 @@ class AccountManager(object):
"""Send presence probe to all registered accounts""" """Send presence probe to all registered accounts"""
result = [self.get_presence(self.component.jid, result = [self.get_presence(self.component.jid,
user.jid, user.jid,
"available") "probe")
for user in account.get_all_users()] for user in account.get_all_users()]
result += [self.get_account_presence_available(\ result += [self.get_presence(_account.jid,
_account.user.jid, _account, _account.user.jid,
_account.default_lang_class)[0] "probe")
for _account in account.get_all_accounts()] for _account in account.get_all_accounts()]
return result return result

10
src/jcl/jabber/tests/component.py
View File

@@ -418,27 +418,27 @@ class JCLComponent_TestCase(JCLTestCase):
self.assertTrue(isinstance(presence, Presence)) self.assertTrue(isinstance(presence, Presence))
self.assertEquals(presence.get_from(), "jcl.test.com") self.assertEquals(presence.get_from(), "jcl.test.com")
self.assertEquals(presence.get_to(), "test1@test.com") self.assertEquals(presence.get_to(), "test1@test.com")
self.assertEquals(presence.get_node().prop("type"), None) self.assertEquals(presence.get_node().prop("type"), "probe")
presence = self.comp.stream.sent[1] presence = self.comp.stream.sent[1]
self.assertTrue(isinstance(presence, Presence)) self.assertTrue(isinstance(presence, Presence))
self.assertEquals(presence.get_from(), "jcl.test.com") self.assertEquals(presence.get_from(), "jcl.test.com")
self.assertEquals(presence.get_to(), "test2@test.com") self.assertEquals(presence.get_to(), "test2@test.com")
self.assertEquals(presence.get_node().prop("type"), None) self.assertEquals(presence.get_node().prop("type"), "probe")
presence = self.comp.stream.sent[2] presence = self.comp.stream.sent[2]
self.assertTrue(isinstance(presence, Presence)) self.assertTrue(isinstance(presence, Presence))
self.assertEquals(presence.get_from(), "account11@jcl.test.com") self.assertEquals(presence.get_from(), "account11@jcl.test.com")
self.assertEquals(presence.get_to(), "test1@test.com") self.assertEquals(presence.get_to(), "test1@test.com")
self.assertEquals(presence.get_node().prop("type"), None) self.assertEquals(presence.get_node().prop("type"), "probe")
presence = self.comp.stream.sent[3] presence = self.comp.stream.sent[3]
self.assertTrue(isinstance(presence, Presence)) self.assertTrue(isinstance(presence, Presence))
self.assertEquals(presence.get_from(), "account12@jcl.test.com") self.assertEquals(presence.get_from(), "account12@jcl.test.com")
self.assertEquals(presence.get_to(), "test1@test.com") self.assertEquals(presence.get_to(), "test1@test.com")
self.assertEquals(presence.get_node().prop("type"), None) self.assertEquals(presence.get_node().prop("type"), "probe")
presence = self.comp.stream.sent[4] presence = self.comp.stream.sent[4]
self.assertTrue(isinstance(presence, Presence)) self.assertTrue(isinstance(presence, Presence))
self.assertEquals(presence.get_from(), "account2@jcl.test.com") self.assertEquals(presence.get_from(), "account2@jcl.test.com")
self.assertEquals(presence.get_to(), "test2@test.com") self.assertEquals(presence.get_to(), "test2@test.com")
self.assertEquals(presence.get_node().prop("type"), None) self.assertEquals(presence.get_node().prop("type"), "probe")
########################################################################### ###########################################################################
# 'signal_handler' tests # 'signal_handler' tests