From 34c4b137aa7a5d52bca328a7dae2017a5d2a04ab Mon Sep 17 00:00:00 2001 From: David Rousselie Date: Thu, 29 May 2008 18:56:02 +0200 Subject: [PATCH] Revert to "probe" presence at initialization instead of "available" presence darcs-hash:20080529165602-86b55-7701fdb03780975ae3f0e78935310d6f5ad4080a.gz --- src/jcl/jabber/component.py | 8 ++++---- src/jcl/jabber/tests/component.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/jcl/jabber/component.py b/src/jcl/jabber/component.py index d16d828..272d14d 100644 --- a/src/jcl/jabber/component.py +++ b/src/jcl/jabber/component.py @@ -408,11 +408,11 @@ class AccountManager(object): """Send presence probe to all registered accounts""" result = [self.get_presence(self.component.jid, user.jid, - "available") + "probe") for user in account.get_all_users()] - result += [self.get_account_presence_available(\ - _account.user.jid, _account, - _account.default_lang_class)[0] + result += [self.get_presence(_account.jid, + _account.user.jid, + "probe") for _account in account.get_all_accounts()] return result diff --git a/src/jcl/jabber/tests/component.py b/src/jcl/jabber/tests/component.py index c0993be..fd8b90c 100644 --- a/src/jcl/jabber/tests/component.py +++ b/src/jcl/jabber/tests/component.py @@ -418,27 +418,27 @@ class JCLComponent_TestCase(JCLTestCase): self.assertTrue(isinstance(presence, Presence)) self.assertEquals(presence.get_from(), "jcl.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] self.assertTrue(isinstance(presence, Presence)) self.assertEquals(presence.get_from(), "jcl.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] self.assertTrue(isinstance(presence, Presence)) self.assertEquals(presence.get_from(), "account11@jcl.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] self.assertTrue(isinstance(presence, Presence)) self.assertEquals(presence.get_from(), "account12@jcl.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] self.assertTrue(isinstance(presence, Presence)) self.assertEquals(presence.get_from(), "account2@jcl.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