summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sleekxmpp/xmlstream/scheduler.py1
-rw-r--r--tests/test_stanza_error.py10
2 files changed, 6 insertions, 5 deletions
diff --git a/sleekxmpp/xmlstream/scheduler.py b/sleekxmpp/xmlstream/scheduler.py
index 0e711b4b..12deeddf 100644
--- a/sleekxmpp/xmlstream/scheduler.py
+++ b/sleekxmpp/xmlstream/scheduler.py
@@ -132,6 +132,7 @@ class Scheduler(object):
if threaded:
self.thread = threading.Thread(name='sheduler_process',
target=self._process)
+ self.thread.daemon = True
self.thread.start()
else:
self._process()
diff --git a/tests/test_stanza_error.py b/tests/test_stanza_error.py
index e1c7d5a4..5eecfee9 100644
--- a/tests/test_stanza_error.py
+++ b/tests/test_stanza_error.py
@@ -9,7 +9,7 @@ class TestErrorStanzas(SleekTest):
msg.enable('error')
self.check(msg, """
<message type="error">
- <error type="cancel">
+ <error type="cancel" code="501">
<feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
</error>
</message>
@@ -22,7 +22,7 @@ class TestErrorStanzas(SleekTest):
self.check(msg, """
<message type="error">
- <error type="cancel">
+ <error type="cancel" code="404">
<item-not-found xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
</error>
</message>
@@ -34,7 +34,7 @@ class TestErrorStanzas(SleekTest):
self.check(msg, """
<message type="error">
- <error type="cancel">
+ <error type="wait" code="500">
<resource-constraint xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
</error>
</message>
@@ -50,7 +50,7 @@ class TestErrorStanzas(SleekTest):
self.check(msg, """
<message type="error">
- <error type="cancel">
+ <error type="wait" code="500">
<text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">Error!</text>
</error>
</message>
@@ -66,7 +66,7 @@ class TestErrorStanzas(SleekTest):
self.check(msg, """
<message type="error">
- <error type="cancel">
+ <error type="wait" code="500">
<internal-server-error xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
</error>
</message>