Commit a31d90bb authored by Benjamin Blanc's avatar Benjamin Blanc

tests: correct testERP5testnode to take into account...

tests: correct testERP5testnode to take into account 2c627797 modifications
parent e44ceb5c
...@@ -517,7 +517,7 @@ ignore-ssl-certificate = true ...@@ -517,7 +517,7 @@ ignore-ssl-certificate = true
os.makedirs(test_result_path_root) os.makedirs(test_result_path_root)
global counter global counter
counter = 0 counter = 0
def patch_startTestSuite(self,test_node_title): def patch_startTestSuite(self,test_node_title, *args, **kw):
global counter global counter
config_list = [] config_list = []
# Sclalability slave testnode is not directly in charge of testsuites # Sclalability slave testnode is not directly in charge of testsuites
...@@ -699,7 +699,7 @@ ignore-ssl-certificate = true ...@@ -699,7 +699,7 @@ ignore-ssl-certificate = true
os.makedirs(test_result_path_root) os.makedirs(test_result_path_root)
global counter global counter
counter = 0 counter = 0
def patch_startTestSuite(self,test_node_title): def patch_startTestSuite(self,test_node_title, *args, **kw):
global counter global counter
config_list = [test_self.getTestSuiteData(reference='aa')[0], config_list = [test_self.getTestSuiteData(reference='aa')[0],
test_self.getTestSuiteData(reference='bb')[0]] test_self.getTestSuiteData(reference='bb')[0]]
...@@ -947,7 +947,7 @@ ignore-ssl-certificate = true ...@@ -947,7 +947,7 @@ ignore-ssl-certificate = true
return result return result
global startTestSuiteDone global startTestSuiteDone
startTestSuiteDone = False startTestSuiteDone = False
def patch_startTestSuite(self,test_node_title): def patch_startTestSuite(self,test_node_title, *args, **kw):
config_list = [] config_list = []
global startTestSuiteDone global startTestSuiteDone
if not startTestSuiteDone: if not startTestSuiteDone:
......
...@@ -200,7 +200,8 @@ branch = %(branch)s ...@@ -200,7 +200,8 @@ branch = %(branch)s
if not os.path.exists(repository_path): if not os.path.exists(repository_path):
parameter_list = [config['git_binary'], 'clone', parameter_list = [config['git_binary'], 'clone',
vcs_repository['url']] vcs_repository['url']]
parameter_list.extend(['-b', branch]) if branch is not None:
parameter_list.extend(['-b', branch])
parameter_list.append(repository_path) parameter_list.append(repository_path)
log(subprocess.check_output(parameter_list, stderr=subprocess.STDOUT)) log(subprocess.check_output(parameter_list, stderr=subprocess.STDOUT))
# Make sure we have local repository # Make sure we have local repository
...@@ -444,4 +445,4 @@ from the distributor.") ...@@ -444,4 +445,4 @@ from the distributor.")
# Exceptions are swallowed during cleanup phase # Exceptions are swallowed during cleanup phase
log("GENERAL EXCEPTION, QUITING") log("GENERAL EXCEPTION, QUITING")
self.cleanUp(test_result) self.cleanUp(test_result)
log("GENERAL EXCEPTION, QUITING, cleanup finished") log("GENERAL EXCEPTION, QUITING, cleanup finished")
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment