From a31d90bbce36ac4d907a758acb92e6663dea21bb Mon Sep 17 00:00:00 2001
From: Benjamin Blanc <benjamin.blanc@tiolive.com>
Date: Tue, 10 Sep 2013 10:19:39 +0200
Subject: [PATCH] tests: correct testERP5testnode to take into account
2c6277979670b81494690cb1917e0c945cf8d9a8 modifications
---
erp5/tests/testERP5TestNode.py | 6 +++---
erp5/util/testnode/testnode.py | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/erp5/tests/testERP5TestNode.py b/erp5/tests/testERP5TestNode.py
index 5104d6d45a..12736b669a 100644
--- a/erp5/tests/testERP5TestNode.py
+++ b/erp5/tests/testERP5TestNode.py
@@ -517,7 +517,7 @@ ignore-ssl-certificate = true
os.makedirs(test_result_path_root)
global counter
counter = 0
- def patch_startTestSuite(self,test_node_title):
+ def patch_startTestSuite(self,test_node_title, *args, **kw):
global counter
config_list = []
# Sclalability slave testnode is not directly in charge of testsuites
@@ -699,7 +699,7 @@ ignore-ssl-certificate = true
os.makedirs(test_result_path_root)
global counter
counter = 0
- def patch_startTestSuite(self,test_node_title):
+ def patch_startTestSuite(self,test_node_title, *args, **kw):
global counter
config_list = [test_self.getTestSuiteData(reference='aa')[0],
test_self.getTestSuiteData(reference='bb')[0]]
@@ -947,7 +947,7 @@ ignore-ssl-certificate = true
return result
global startTestSuiteDone
startTestSuiteDone = False
- def patch_startTestSuite(self,test_node_title):
+ def patch_startTestSuite(self,test_node_title, *args, **kw):
config_list = []
global startTestSuiteDone
if not startTestSuiteDone:
diff --git a/erp5/util/testnode/testnode.py b/erp5/util/testnode/testnode.py
index 1ed6245eb9..d26a84df60 100644
--- a/erp5/util/testnode/testnode.py
+++ b/erp5/util/testnode/testnode.py
@@ -200,7 +200,8 @@ branch = %(branch)s
if not os.path.exists(repository_path):
parameter_list = [config['git_binary'], 'clone',
vcs_repository['url']]
- parameter_list.extend(['-b', branch])
+ if branch is not None:
+ parameter_list.extend(['-b', branch])
parameter_list.append(repository_path)
log(subprocess.check_output(parameter_list, stderr=subprocess.STDOUT))
# Make sure we have local repository
@@ -444,4 +445,4 @@ from the distributor.")
# Exceptions are swallowed during cleanup phase
log("GENERAL EXCEPTION, QUITING")
self.cleanUp(test_result)
- log("GENERAL EXCEPTION, QUITING, cleanup finished")
\ No newline at end of file
+ log("GENERAL EXCEPTION, QUITING, cleanup finished")
--
2.30.9