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

[nobody at svn.erp5.org]

Author: luke
Date: Thu Dec  2 17:01:37 2010
New Revision: 41046

URL: http://svn.erp5.org?rev=41046&view=rev
Log:
 - allow a way to add tail to instance, to make them configurable on test machines

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=41046&r1=41045&r2=41046&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.appliance.test/CHANGES.txt [utf8] (original)
+++ erp5/trunk/utils/erp5.appliance.test/CHANGES.txt [utf8] Thu Dec  2 17:01:37 2010
@@ -1,6 +1,9 @@
 2.1 (unreleased)
 ----------------
 
+ - allow to pass tail to instance, which makes possible to configure instance
+   ports on test machines [Łukasz Nowak]
+
 2.0 (2010-12-02)
 ----------------
 

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=41046&r1=41045&r2=41046&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 17:01:37 2010
@@ -288,7 +288,9 @@ class TimeoutException(Exception):
 software_buildout = """
 [buildout]
 extends = https://svn.erp5.org/repos/public/erp5/trunk/buildout/buildout-2.12.cfg
-extends-cache = extends-cache"""
+extends-cache = extends-cache
+
+"""
 
 instance_buildout_first_run = """[buildout]
 extends-cache = %(extends_cache)s
@@ -299,11 +301,15 @@ extends =
 parts =
   mysql-instance
   oood-instance
-  supervisor-instance"""
+  supervisor-instance
+
+"""
 
 
 instance_buildout_complete = instance_buildout_first_run + """
-  runUnitTest"""
+  runUnitTest
+
+"""
 
 
 def detectRevision(config, url):
@@ -375,6 +381,11 @@ def run_once(config, software_path,
   status = False
   begin = time.time()
 
+  if config.instance_tail:
+    instance_tail = file(config.instance_tail, 'r').read()
+  else:
+    instance_tail = ''
+
   # Configure ERP5 test reporting handler
   revision = detectRevision(config, software_profile_url)
   erp5_handler = None
@@ -436,7 +447,7 @@ def run_once(config, software_path,
         instance_template_file = os.path.join(software_path, 'instance.inc')
       )
       file(os.path.join(instance_path, 'buildout.cfg'), 'w').write(
-          instance_buildout_first_run % instance_kw)
+          instance_buildout_first_run % instance_kw + instance_tail)
 
       # Bootstrap instance
       instance_bootstrap = [os.path.join(software_path, 'bin',
@@ -476,7 +487,7 @@ def run_once(config, software_path,
               ("mysql> ", "exit")])
         # Update profile
         file(os.path.join(instance_path, 'buildout.cfg'), 'w').write(
-          instance_buildout_complete % instance_kw)
+          instance_buildout_complete % instance_kw + instance_tail)
         # Re run buildout
         callWithTimeout(instance_buildout, config, timeout=600, cwd=instance_path)
         # Run a test from readme
@@ -642,7 +653,10 @@ class Parser(OptionParser):
              default=14400),
       Option("-c", "--config",
              help="Configuration file. Command line arguments will override.",
-             type=str)
+             type=str),
+      Option("-i", "--instance_tail",
+             help="File with local additions to instance buildout.",
+             type=str),
     ])
 
   def check_args(self):