summaryrefslogtreecommitdiff
path: root/testall.py
diff options
context:
space:
mode:
authorPedro Vicente <pedrovfer@gmail.com>2012-11-12 13:55:32 +0100
committerPedro Vicente <pedrovfer@gmail.com>2012-11-12 13:55:32 +0100
commita1d988fed5839a0d6f44340ed3dae8496e1b9a58 (patch)
tree0c2a657ad63afbeb2b82d0d3453608e8a907c04e /testall.py
parent2d066c34fd58882901fea0d82c34ad37e312cd27 (diff)
parentb0c50b7a59fbc18cb01158fc901013a63ed87b90 (diff)
downloadslixmpp-a1d988fed5839a0d6f44340ed3dae8496e1b9a58.tar.gz
slixmpp-a1d988fed5839a0d6f44340ed3dae8496e1b9a58.tar.bz2
slixmpp-a1d988fed5839a0d6f44340ed3dae8496e1b9a58.tar.xz
slixmpp-a1d988fed5839a0d6f44340ed3dae8496e1b9a58.zip
Merge branch 'upgrading_sleekxmpp_1_1_11' into develop_sleek
Diffstat (limited to 'testall.py')
-rwxr-xr-xtestall.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/testall.py b/testall.py
index c9ad5448..2cb6f538 100755
--- a/testall.py
+++ b/testall.py
@@ -1,7 +1,11 @@
#!/usr/bin/env python
-import os
import sys
+if len(sys.argv)>1 and sys.argv[1].lower() == 'gevent':
+ from gevent import monkey
+ monkey.patch_all()
+
+import os
import logging
import unittest
import distutils.core
@@ -57,7 +61,7 @@ class TestCommand(distutils.core.Command):
if __name__ == '__main__':
result = run_tests()
- print("<tests %s ran='%s' errors='%s' fails='%s' success='%s' />" % (
+ print("<tests %s ran='%s' errors='%s' fails='%s' success='%s' gevent_enabled=%s/>" % (
"xmlns='http//andyet.net/protocol/tests'",
result.testsRun, len(result.errors),
- len(result.failures), result.wasSuccessful()))
+ len(result.failures), result.wasSuccessful(),'gevent' in sys.modules))