github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-27 19:19:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into stream_features

Browse source
This commit is contained in:
Lance Stout 2011-04-11 14:23:47 -04:00
commit ea8c40c7b6
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sleekxmpp/xmlstream/scheduler.py
View file

@ -132,6 +132,7 @@ class Scheduler(object):
if threaded: if threaded:
self.thread = threading.Thread(name='sheduler_process', self.thread = threading.Thread(name='sheduler_process',
target=self._process) target=self._process)
self.thread.daemon = True
self.thread.start() self.thread.start()
else: else:
self._process() self._process()

10
tests/test_stanza_error.py
View file

@ -9,7 +9,7 @@ class TestErrorStanzas(SleekTest):
msg.enable('error') msg.enable('error')
self.check(msg, """ self.check(msg, """
<message type="error"> <message type="error">
<error type="cancel"> <error type="cancel" code="501">
<feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> <feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
</error> </error>
</message> </message>
@ -22,7 +22,7 @@ class TestErrorStanzas(SleekTest):
self.check(msg, """ self.check(msg, """
<message type="error"> <message type="error">
<error type="cancel"> <error type="cancel" code="404">
<item-not-found xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> <item-not-found xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
</error> </error>
</message> </message>
@ -34,7 +34,7 @@ class TestErrorStanzas(SleekTest):
self.check(msg, """ self.check(msg, """
<message type="error"> <message type="error">
<error type="cancel"> <error type="wait" code="500">
<resource-constraint xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> <resource-constraint xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
</error> </error>
</message> </message>
@ -50,7 +50,7 @@ class TestErrorStanzas(SleekTest):
self.check(msg, """ self.check(msg, """
<message type="error"> <message type="error">
<error type="cancel"> <error type="wait" code="500">
<text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">Error!</text> <text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">Error!</text>
</error> </error>
</message> </message>
@ -66,7 +66,7 @@ class TestErrorStanzas(SleekTest):
self.check(msg, """ self.check(msg, """
<message type="error"> <message type="error">
<error type="cancel"> <error type="wait" code="500">
<internal-server-error xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> <internal-server-error xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
</error> </error>
</message> </message>