From 8eaf1cf0c98cc9f60e1f9e771f5ca388963741cd Mon Sep 17 00:00:00 2001 From: David Rousselie Date: Fri, 28 Sep 2007 20:05:51 +0200 Subject: [PATCH] Return accounts and legacyjids in get_user_roster ad-hoc command darcs-hash:20070928180551-86b55-f04f01afdd848508ffdb48d9da4ee18e4918994c.gz --- src/jcl/jabber/command.py | 4 ++++ src/jcl/jabber/tests/command.py | 30 +++++++++++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/jcl/jabber/command.py b/src/jcl/jabber/command.py index d7ba921..7730eba 100644 --- a/src/jcl/jabber/command.py +++ b/src/jcl/jabber/command.py @@ -713,6 +713,10 @@ class JCLCommandManager(CommandManager): query = x_form.newChild(None, "query", None) roster_ns = query.newNs("jabber:iq:roster", None) query.setNs(roster_ns) + for _account in account.get_accounts(user_jid): + item = query.newChild(None, "item", None) + item.setProp("jid", _account.jid) + item.setProp("name", _account.name) for legacy_jid in account.get_legacy_jids(user_jid): item = query.newChild(None, "item", None) item.setProp("jid", legacy_jid.jid) diff --git a/src/jcl/jabber/tests/command.py b/src/jcl/jabber/tests/command.py index 2da4f19..fb20432 100644 --- a/src/jcl/jabber/tests/command.py +++ b/src/jcl/jabber/tests/command.py @@ -1498,32 +1498,32 @@ class JCLCommandManager_TestCase(JCLTestCase): name="account11", jid="account11@jcl.test.com") ljid111 = LegacyJID(legacy_address="test111@test.com", - jid="test111%test.com@test.com", + jid="test111%test.com@jcl.test.com", account=account11) ljid112 = LegacyJID(legacy_address="test112@test.com", - jid="test112%test.com@test.com", + jid="test112%test.com@jcl.test.com", account=account11) account12 = Example2Account(user=user1, name="account12", jid="account12@jcl.test.com") ljid121 = LegacyJID(legacy_address="test121@test.com", - jid="test121%test.com@test.com", + jid="test121%test.com@jcl.test.com", account=account12) user2 = User(jid="test2@test.com") account21 = ExampleAccount(user=user2, name="account21", jid="account21@jcl.test.com") ljid211 = LegacyJID(legacy_address="test211@test.com", - jid="test211%test.com@test.com", + jid="test211%test.com@jcl.test.com", account=account21) ljid212 = LegacyJID(legacy_address="test212@test.com", - jid="test212%test.com@test.com", + jid="test212%test.com@jcl.test.com", account=account21) account22 = ExampleAccount(user=user2, name="account11", jid="account11@jcl.test.com") ljid221 = LegacyJID(legacy_address="test221@test.com", - jid="test221%test.com@test.com", + jid="test221%test.com@jcl.test.com", account=account22) model.db_disconnect() info_query = Iq(stanza_type="set", @@ -1582,13 +1582,17 @@ class JCLCommandManager_TestCase(JCLTestCase): {"c": "http://jabber.org/protocol/commands", "data": "jabber:x:data", "roster": "jabber:iq:roster"}) - self.assertEquals(len(items), 3) - self.assertEquals(items[0].prop("jid"), "test111%test.com@test.com") - self.assertEquals(items[0].prop("name"), "test111@test.com") - self.assertEquals(items[1].prop("jid"), "test112%test.com@test.com") - self.assertEquals(items[1].prop("name"), "test112@test.com") - self.assertEquals(items[2].prop("jid"), "test121%test.com@test.com") - self.assertEquals(items[2].prop("name"), "test121@test.com") + self.assertEquals(len(items), 5) + self.assertEquals(items[0].prop("jid"), "account11@jcl.test.com") + self.assertEquals(items[0].prop("name"), "account11") + self.assertEquals(items[1].prop("jid"), "account12@jcl.test.com") + self.assertEquals(items[1].prop("name"), "account12") + self.assertEquals(items[2].prop("jid"), "test111%test.com@jcl.test.com") + self.assertEquals(items[2].prop("name"), "test111@test.com") + self.assertEquals(items[3].prop("jid"), "test112%test.com@jcl.test.com") + self.assertEquals(items[3].prop("name"), "test112@test.com") + self.assertEquals(items[4].prop("jid"), "test121%test.com@jcl.test.com") + self.assertEquals(items[4].prop("name"), "test121@test.com") def test_execute_get_user_lastlogin(self): self.comp.account_manager.account_classes = (ExampleAccount,