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

[nobody at svn.erp5.org]

Author: luke
Date: Fri Dec 10 11:29:57 2010
New Revision: 41314

URL: http://svn.erp5.org?rev=41314&view=rev
Log:
 - follow new readme -- only run once instance buildout
 - fix 2.6 changelog

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=41314&r1=41313&r2=41314&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.appliance.test/CHANGES.txt [utf8] (original)
+++ erp5/trunk/utils/erp5.appliance.test/CHANGES.txt [utf8] Fri Dec 10 11:29:57 2010
@@ -1,12 +1,16 @@
 2.7 (unreleased)
 ----------------
 
+ - follow new way of dealing with instances -- only one buildout to run
+   [Łukasz Nowak]
+
 2.6 (2010-12-09)
 ----------------
 
  - allow to pass revision_detect_url and default to public repository, as
    previous way of detecting revision, by using passed software url was
    fetching revision only from this file, instead of whole repository
+   [Łukasz Nowak]
 
 2.5 (2010-12-08)
 ----------------

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=41314&r1=41313&r2=41314&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.appliance.test/src/test.py [utf8] (original)
+++ erp5/trunk/utils/erp5.appliance.test/src/test.py [utf8] Fri Dec 10 11:29:57 2010
@@ -292,7 +292,7 @@ extends-cache = extends-cache
 
 """
 
-instance_buildout_first_run = """[buildout]
+instance_buildout = """[buildout]
 extends-cache = %(extends_cache)s
 extends =
   %(instance_profile_url)s
@@ -302,16 +302,10 @@ parts =
   mysql-instance
   oood-instance
   supervisor-instance
-
-"""
-
-
-instance_buildout_complete = instance_buildout_first_run + """
   runUnitTest
 
 """
 
-
 def detectRevision(config):
   revision = 'UNKNOWN'
   etag = urllib.urlopen(config.revision_detect_url).headers.get('etag')
@@ -449,16 +443,16 @@ 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_tail)
+          instance_buildout % instance_kw + instance_tail)
 
       # Bootstrap instance
       instance_bootstrap = [os.path.join(software_path, 'bin',
                                                   binary_bootstrap_file_name)]
       callWithTimeout(instance_bootstrap, config, cwd=instance_path)
 
-      # Run buildout for first time
-      instance_buildout = [os.path.join(instance_path, 'bin', 'buildout')]
-      callWithTimeout(instance_buildout, config, cwd=instance_path)
+      # Run instance buildout
+      callWithTimeout([os.path.join(instance_path, 'bin', 'buildout')],
+          config, cwd=instance_path)
 
       # Start supervisor in foreground mode and have control over its process
       # as in the end it have to be cleanly shutdown
@@ -487,11 +481,6 @@ def run_once(config, software_path,
               ("mysql> ", "grant all privileges on test212.* to "
                 "'test'@'127.0.0.1';"),
               ("mysql> ", "exit")])
-        # Update profile
-        file(os.path.join(instance_path, 'buildout.cfg'), 'w').write(
-          instance_buildout_complete % instance_kw + instance_tail)
-        # Re run buildout
-        callWithTimeout(instance_buildout, config, timeout=600, cwd=instance_path)
         # Run a test from readme
         test_run_command = [os.path.join(instance_path, 'bin', 'runUnitTest'),
             'testClassTool']