summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-08-11 18:41:57 -0400
committerLance Stout <lancestout@gmail.com>2010-08-11 18:41:57 -0400
commit7a5ef2849218e122b04e244aeedd67844a0690b2 (patch)
treee28a3657fdb6c8755218b922ee882d2a4e26d6bb
parentc09e9c702c114f76d6cbfd9d7fb1a19cefa5a1e5 (diff)
downloadslixmpp-7a5ef2849218e122b04e244aeedd67844a0690b2.tar.gz
slixmpp-7a5ef2849218e122b04e244aeedd67844a0690b2.tar.bz2
slixmpp-7a5ef2849218e122b04e244aeedd67844a0690b2.tar.xz
slixmpp-7a5ef2849218e122b04e244aeedd67844a0690b2.zip
Updated SleekTest.streamClose to check that the stream was actually started before closing it.
Updated tests for Iq stanzas to not start a stream for every test; tests now run a lot faster. The call to streamClose must still be in the tearDown method to ensure it is called in the case of an error.
-rw-r--r--tests/sleektest.py2
-rw-r--r--tests/test_iqstanzas.py5
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/sleektest.py b/tests/sleektest.py
index a7116544..0adab2b2 100644
--- a/tests/sleektest.py
+++ b/tests/sleektest.py
@@ -258,7 +258,7 @@ class SleekTest(unittest.TestCase):
self.checkPresence(data, sent, use_values)
def streamClose(self):
- if self.xmpp is not None:
+ if hasattr(self, 'xmpp') and self.xmpp is not None:
self.xmpp.disconnect()
self.xmpp.socket.recvData(self.xmpp.stream_footer)
diff --git a/tests/test_iqstanzas.py b/tests/test_iqstanzas.py
index 98a01a26..2dabc5e9 100644
--- a/tests/test_iqstanzas.py
+++ b/tests/test_iqstanzas.py
@@ -4,10 +4,6 @@ from sleekxmpp.xmlstream.stanzabase import ET
class TestIqStanzas(SleekTest):
- def setUp(self):
- """Start XML stream for testing."""
- self.streamStart()
-
def tearDown(self):
"""Shutdown the XML stream after testing."""
self.streamClose()
@@ -32,6 +28,7 @@ class TestIqStanzas(SleekTest):
def testUnhandled(self):
"""Test behavior for Iq.unhandled."""
+ self.streamStart()
self.streamRecv("""
<iq id="test" type="get">
<query xmlns="test" />