Merge branch 'develop' into roster

2011-03-24 09:36:26 -04:00
parent 393259c24b a3d111be12
commit d9be51b2ef
15 changed files with 2085 additions and 20 deletions
--- a/sleekxmpp/test/sleektest.py
+++ b/sleekxmpp/test/sleektest.py
@@ -604,7 +604,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.