[pypy-svn] r64416 - pypy/trunk/lib-python

[iko at codespeak.net]

Author: iko
Date: Sun Apr 19 22:41:04 2009
New Revision: 64416

Modified:
   pypy/trunk/lib-python/conftest.py
Log:
Change timeout to 1000s (test_hashlib takes ~350s on bigboard buildbot)



Modified: pypy/trunk/lib-python/conftest.py
==============================================================================
--- pypy/trunk/lib-python/conftest.py	(original)
+++ pypy/trunk/lib-python/conftest.py	Sun Apr 19 22:41:04 2009
@@ -31,7 +31,7 @@
     def pytest_addoption(self, parser):
         group = parser.addgroup("complicance testing options") 
         group.addoption('-T', '--timeout', action="store", type="string", 
-           default="100mp", dest="timeout", 
+           default="1000", dest="timeout", 
            help="fail a test module after the given timeout. "
                 "specify in seconds or 'NUMmp' aka Mega-Pystones")
         group.addoption('--pypy', action="store", type="string",