summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorNathan Fritz <nathan@andyet.net>2010-10-14 16:27:44 -0700
committerNathan Fritz <nathan@andyet.net>2010-10-14 16:27:44 -0700
commit95ad8a1878c5792101e6bd9d1f64a2bbbe223398 (patch)
tree84c38d7dbb7851c578ea34fe5cf28a1c6c59e4af /sleekxmpp
parentaeb7999e6af33cf1c7197fa68ba826552c6cf0dd (diff)
downloadslixmpp-95ad8a1878c5792101e6bd9d1f64a2bbbe223398.tar.gz
slixmpp-95ad8a1878c5792101e6bd9d1f64a2bbbe223398.tar.bz2
slixmpp-95ad8a1878c5792101e6bd9d1f64a2bbbe223398.tar.xz
slixmpp-95ad8a1878c5792101e6bd9d1f64a2bbbe223398.zip
fixed stream test not disconnecting cleanly
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/clientxmpp.py3
-rw-r--r--sleekxmpp/test/sleektest.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index 73ab8075..7d000bfa 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -174,8 +174,7 @@ class ClientXMPP(BaseXMPP):
if not address:
# If all else fails, use the server from the JID.
- address = (self.server, 5222)
- logging.debug("The server is %s" % self.server)
+ address = (self.boundjid.host, 5222)
return XMLStream.connect(self, address[0], address[1], use_tls=True)
diff --git a/sleekxmpp/test/sleektest.py b/sleekxmpp/test/sleektest.py
index 89e3712f..efe81212 100644
--- a/sleekxmpp/test/sleektest.py
+++ b/sleekxmpp/test/sleektest.py
@@ -638,8 +638,8 @@ class SleekTest(unittest.TestCase):
that the XMPP client is disconnected after an error.
"""
if hasattr(self, 'xmpp') and self.xmpp is not None:
- self.xmpp.disconnect()
self.xmpp.socket.recv_data(self.xmpp.stream_footer)
+ self.xmpp.disconnect()
# ------------------------------------------------------------------
# XML Comparison and Cleanup