Merge branch 'master' into apache

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.2-dev1'
+version = '0.3-dev5'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

slapos/recipe/erp5testnode/Updater.py

@@ -147,7 +147,7 @@ class Updater(object):
       # edit .git/info/sparse-checkout if you want sparse checkout
       if revision:
         if type(revision) is str:
-          h = self._git_find_rev('r' + revision)
+          h = revision
         else:
           h = revision[1]
         if h != self._git('rev-parse', 'HEAD'):

slapos/recipe/erp5testnode/__init__.py

@@ -97,8 +97,8 @@ class Recipe(BaseSlapRecipe):
               bot_environment=self.parameter_dict.get('bot_environment', ''),
               partition_reference=CONFIG['partition_reference'],
               environment=dict(PATH=os.environ['PATH']),
-              vcs_authentication_list=self.parameter_dict.get(
-                     'vcs_authentication_list')
+              vcs_authentication_list=eval(self.parameter_dict.get(
+                     'vcs_authentication_list')),
             )
           ]))
 
@@ -112,8 +112,9 @@ class Recipe(BaseSlapRecipe):
     print "home_directory : %r" % home_directory
     git_dict.setdefault("git_server_name", "git.erp5.org")
     if git_dict.get('vcs_authentication_list', None) is not None:
+      vcs_authentication_list = eval(git_dict['vcs_authentication_list'])
       netrc_file = open(os.path.join(home_directory, '.netrc'), 'w')
-      for vcs_authentication_dict in git_dict['vcs_authentication_list']:
+      for vcs_authentication_dict in vcs_authentication_list:
         netrc_file.write("""
 machine %(host)s
 login %(user_name)s

slapos/recipe/erp5testnode/testnode.py

@@ -94,7 +94,7 @@ repository = %(repository_path)s
 branch = %(branch)s
 """ %  {'buildout_section_id': buildout_section_id,
         'repository_path' : repository_path,
-        'branch' : vcs_repository.get('branch','')}
+        'branch' : vcs_repository.get('branch','master')}
 
   custom_profile = open(custom_profile_path, 'w')
   custom_profile.write(profile_content)
@@ -224,6 +224,7 @@ branch = %(branch)s
           invocation_list.extend([run_test_suite_path,
                                   '--test_suite', config['test_suite'],
                                   '--revision', revision,
+                                  '--test_suite_title', test_suite_title,
                                   '--node_quantity', config['node_quantity'],
                                   '--master_url', config['test_suite_master_url']])
           run_test_suite = subprocess.Popen(invocation_list)