summaryrefslogtreecommitdiff
path: root/sleekxmpp/test
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-03-24 09:36:35 -0400
committerLance Stout <lancestout@gmail.com>2011-03-24 09:36:35 -0400
commitbf2f2782b7b64be97948f56e21d55b969072c4dc (patch)
tree45001e4822e5dc654de2658ee88c73966e907ef1 /sleekxmpp/test
parent694673b9bdc108ae109efd4dafa8893a22952b94 (diff)
parenta3d111be12144d9dea80165d84cd8168714d3d54 (diff)
downloadslixmpp-bf2f2782b7b64be97948f56e21d55b969072c4dc.tar.gz
slixmpp-bf2f2782b7b64be97948f56e21d55b969072c4dc.tar.bz2
slixmpp-bf2f2782b7b64be97948f56e21d55b969072c4dc.tar.xz
slixmpp-bf2f2782b7b64be97948f56e21d55b969072c4dc.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/test')
-rw-r--r--sleekxmpp/test/sleektest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/test/sleektest.py b/sleekxmpp/test/sleektest.py
index b5c28fde..c5f48895 100644
--- a/sleekxmpp/test/sleektest.py
+++ b/sleekxmpp/test/sleektest.py
@@ -578,7 +578,7 @@ class SleekTest(unittest.TestCase):
raise ValueError("Uknown matching method: %s" % method)
def send(self, data, defaults=None, use_values=True,
- timeout=.1, method='exact'):
+ timeout=.5, method='exact'):
"""
Check that the XMPP client sent the given stanza XML.