From c6bf50a607b32559fae62882dff51bce5890d576 Mon Sep 17 00:00:00 2001 From: David Rousselie Date: Mon, 18 Jun 2007 20:55:47 +0200 Subject: [PATCH] Correct disco category and type darcs-hash:20070618185547-86b55-7947fffac7c785f8e34c989a5a42787fc9acb152.gz --- src/jcl/jabber/component.py | 8 ++++---- src/jcl/jabber/tests/component.py | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/jcl/jabber/component.py b/src/jcl/jabber/component.py index 5afda38..59bbd88 100644 --- a/src/jcl/jabber/component.py +++ b/src/jcl/jabber/component.py @@ -75,16 +75,16 @@ class JCLComponent(Component, object): server, port, db_connection_str, - disco_category="gateway", - disco_type="headline", + disco_category="headline", + disco_type="x-unknown", lang=Lang()): Component.__init__(self, JID(jid), secret, server, port, - disco_category, - disco_type) + disco_category=disco_category, + disco_type=disco_type) # default values self.name = lang.get_default_lang_class().component_name self.spool_dir = "." diff --git a/src/jcl/jabber/tests/component.py b/src/jcl/jabber/tests/component.py index 5270569..776da39 100644 --- a/src/jcl/jabber/tests/component.py +++ b/src/jcl/jabber/tests/component.py @@ -498,9 +498,9 @@ class JCLComponent_TestCase(unittest.TestCase): # 'disco_get_info' tests ########################################################################### def test_disco_get_info(self): - info_query = Iq(stanza_type = "get", \ - from_jid = "user1@test.com", \ - to_jid = "jcl.test.com") + info_query = Iq(stanza_type="get", + from_jid="user1@test.com", + to_jid="jcl.test.com") disco_info = self.comp.disco_get_info(None, info_query) self.assertEquals(disco_info.get_identities()[0].get_name(), self.comp.name) self.assertTrue(disco_info.has_feature("jabber:iq:version")) @@ -508,28 +508,28 @@ class JCLComponent_TestCase(unittest.TestCase): def test_disco_get_info_multiple_account_type(self): self.comp.account_manager.account_classes = (ExampleAccount, Example2Account) - info_query = Iq(stanza_type = "get", \ - from_jid = "user1@test.com", \ - to_jid = "jcl.test.com") + info_query = Iq(stanza_type="get", + from_jid="user1@test.com", + to_jid="jcl.test.com") disco_info = self.comp.disco_get_info(None, info_query) - self.assertEquals(disco_info.get_identities()[0].get_name(), \ + self.assertEquals(disco_info.get_identities()[0].get_name(), self.comp.name) self.assertTrue(disco_info.has_feature("jabber:iq:version")) self.assertFalse(disco_info.has_feature("jabber:iq:register")) def test_disco_get_info_node(self): - info_query = Iq(stanza_type = "get", \ - from_jid = "user1@test.com", \ - to_jid = "node_test@jcl.test.com") + info_query = Iq(stanza_type="get", + from_jid="user1@test.com", + to_jid="node_test@jcl.test.com") disco_info = self.comp.disco_get_info("node_test", info_query) self.assertTrue(disco_info.has_feature("jabber:iq:register")) def test_disco_get_info_long_node(self): self.comp.account_manager.account_classes = (ExampleAccount, Example2Account) - info_query = Iq(stanza_type = "get", \ - from_jid = "user1@test.com", \ - to_jid = "node_test@jcl.test.com/node_type") - disco_info = self.comp.disco_get_info("node_type/node_test", \ + info_query = Iq(stanza_type="get", + from_jid="user1@test.com", + to_jid="node_test@jcl.test.com/node_type") + disco_info = self.comp.disco_get_info("node_type/node_test", info_query) self.assertTrue(disco_info.has_feature("jabber:iq:register"))