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

Correct disco category and type

Browse Source 
darcs-hash:20070618185547-86b55-7947fffac7c785f8e34c989a5a42787fc9acb152.gz
This commit is contained in:
David Rousselie
2007-06-18 20:55:47 +02:00
parent d8a8bc0070
commit c6bf50a607
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,16 +75,16 @@ class JCLComponent(Component, object):
server, server,
port, port,
db_connection_str, db_connection_str,
disco_category="gateway", disco_category="headline",
disco_type="headline", disco_type="x-unknown",
lang=Lang()): lang=Lang()):
Component.__init__(self, Component.__init__(self,
JID(jid), JID(jid),
secret, secret,
server, server,
port, port,
disco_category, disco_category=disco_category,
disco_type) disco_type=disco_type)
# default values # default values
self.name = lang.get_default_lang_class().component_name self.name = lang.get_default_lang_class().component_name
self.spool_dir = "." self.spool_dir = "."

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

@@ -498,9 +498,9 @@ class JCLComponent_TestCase(unittest.TestCase):
# 'disco_get_info' tests # 'disco_get_info' tests
########################################################################### ###########################################################################
def test_disco_get_info(self): def test_disco_get_info(self):
info_query = Iq(stanza_type = "get", \ info_query = Iq(stanza_type="get",
from_jid = "user1@test.com", \ from_jid="user1@test.com",
to_jid = "jcl.test.com") to_jid="jcl.test.com")
disco_info = self.comp.disco_get_info(None, info_query) disco_info = self.comp.disco_get_info(None, info_query)
self.assertEquals(disco_info.get_identities()[0].get_name(), self.comp.name) self.assertEquals(disco_info.get_identities()[0].get_name(), self.comp.name)
self.assertTrue(disco_info.has_feature("jabber:iq:version")) 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): def test_disco_get_info_multiple_account_type(self):
self.comp.account_manager.account_classes = (ExampleAccount, Example2Account) self.comp.account_manager.account_classes = (ExampleAccount, Example2Account)
info_query = Iq(stanza_type = "get", \ info_query = Iq(stanza_type="get",
from_jid = "user1@test.com", \ from_jid="user1@test.com",
to_jid = "jcl.test.com") to_jid="jcl.test.com")
disco_info = self.comp.disco_get_info(None, info_query) 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.comp.name)
self.assertTrue(disco_info.has_feature("jabber:iq:version")) self.assertTrue(disco_info.has_feature("jabber:iq:version"))
self.assertFalse(disco_info.has_feature("jabber:iq:register")) self.assertFalse(disco_info.has_feature("jabber:iq:register"))
def test_disco_get_info_node(self): def test_disco_get_info_node(self):
info_query = Iq(stanza_type = "get", \ info_query = Iq(stanza_type="get",
from_jid = "user1@test.com", \ from_jid="user1@test.com",
to_jid = "node_test@jcl.test.com") to_jid="node_test@jcl.test.com")
disco_info = self.comp.disco_get_info("node_test", info_query) disco_info = self.comp.disco_get_info("node_test", info_query)
self.assertTrue(disco_info.has_feature("jabber:iq:register")) self.assertTrue(disco_info.has_feature("jabber:iq:register"))
def test_disco_get_info_long_node(self): def test_disco_get_info_long_node(self):
self.comp.account_manager.account_classes = (ExampleAccount, Example2Account) self.comp.account_manager.account_classes = (ExampleAccount, Example2Account)
info_query = Iq(stanza_type = "get", \ info_query = Iq(stanza_type="get",
from_jid = "user1@test.com", \ from_jid="user1@test.com",
to_jid = "node_test@jcl.test.com/node_type") to_jid="node_test@jcl.test.com/node_type")
disco_info = self.comp.disco_get_info("node_type/node_test", \ disco_info = self.comp.disco_get_info("node_type/node_test",
info_query) info_query)
self.assertTrue(disco_info.has_feature("jabber:iq:register")) self.assertTrue(disco_info.has_feature("jabber:iq:register"))