[Erp5-report] r41017 luke - in /erp5/trunk/utils/erp5.appliance.test: CHANGES.txt src/test.py

[nobody at svn.erp5.org]

Author: luke
Date: Thu Dec  2 11:16:31 2010
New Revision: 41017

URL: http://svn.erp5.org?rev=41017&view=rev
Log:
 - allow to pass buildout run timeout

Modified:
    erp5/trunk/utils/erp5.appliance.test/CHANGES.txt
    erp5/trunk/utils/erp5.appliance.test/src/test.py

Modified: erp5/trunk/utils/erp5.appliance.test/CHANGES.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.appliance.test/CHANGES.txt?rev=41017&r1=41016&r2=41017&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.appliance.test/CHANGES.txt [utf8] (original)
+++ erp5/trunk/utils/erp5.appliance.test/CHANGES.txt [utf8] Thu Dec  2 11:16:31 2010
@@ -3,6 +3,8 @@
 
  - Added bulletproofnes by not raising exceptions. [Łukasz Nowak]
  - Update a readme a bit. [Łukasz Nowak]
+ - Allow to pass buildout run timeout to be less restrictive for overloaded
+   test machines. [Łukasz Nowak]
 
 1.14 (2010-11-29)
 -----------------

Modified: erp5/trunk/utils/erp5.appliance.test/src/test.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.appliance.test/src/test.py?rev=41017&r1=41016&r2=41017&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.appliance.test/src/test.py [utf8] (original)
+++ erp5/trunk/utils/erp5.appliance.test/src/test.py [utf8] Thu Dec  2 11:16:31 2010
@@ -420,7 +420,7 @@ def run_once(config, software_path,
       if config.verbose is True:
         buildout_command.append('-v')
       buildout_command.extend(['-c', buildout_file_name])
-      callWithTimeout(buildout_command, config, timeout=14400, cwd=software_path)
+      callWithTimeout(buildout_command, config, timeout=config.buildout_timeout, cwd=software_path)
 
       # Assert software
       assert_command = [config.python, 'tests/assertSoftware.py']
@@ -647,6 +647,10 @@ class Parser(OptionParser):
              help="Python binary to use to run buildout.",
              type=str,
              default="python"),
+      Option("-t", "--buildout_timeout",
+             help="Timeout, in seconds, of buildout run, defaults to 14400.",
+             type=long,
+             default=14400),
       Option("-c", "--config",
              help="Configuration file. Command line arguments will override.",
              type=str)