Commit 46186b06 authored by Benjamin Blanc's avatar Benjamin Blanc

Up, works fine

parent a9c8f164
...@@ -69,6 +69,7 @@ class ERP5TestNode(TestCase): ...@@ -69,6 +69,7 @@ class ERP5TestNode(TestCase):
config["git_binary"] = "git" config["git_binary"] = "git"
config["slapos_directory"] = self.slapos_directory config["slapos_directory"] = self.slapos_directory
config["working_directory"] = self.working_directory config["working_directory"] = self.working_directory
config["software_directory"] = self.software_directory
config["node_quantity"] = 3 config["node_quantity"] = 3
config["test_suite_directory"] = self.test_suite_directory config["test_suite_directory"] = self.test_suite_directory
config["environment"] = self.environment config["environment"] = self.environment
...@@ -877,7 +878,7 @@ branch = foo ...@@ -877,7 +878,7 @@ branch = foo
def patch_generateConfiguration(self, *args, **kw): def patch_generateConfiguration(self, *args, **kw):
return json.dumps({"configuration_list": [{"ok":"ok"}], "involved_nodes_computer_guid"\ return json.dumps({"configuration_list": [{"ok":"ok"}], "involved_nodes_computer_guid"\
: ["COMP1", "COMP2", "COMP3"], "error_message": "No error.", "launcher_nodes_computer_guid": ["COMP1"], \ : ["COMP1", "COMP2", "COMP3"], "error_message": "No error.", "launcher_nodes_computer_guid": ["COMP1"], \
"launchable": False, "randomized_path" : "azertyuiop"}) "launchable": True, "randomized_path" : "azertyuiop"})
def doNothing(self, *args, **kw): def doNothing(self, *args, **kw):
pass pass
def patch_getSlaposAccountKey(self, *args, **kw): def patch_getSlaposAccountKey(self, *args, **kw):
......
...@@ -404,7 +404,6 @@ from the distributor.") ...@@ -404,7 +404,6 @@ from the distributor.")
node_test_suite.retry = True node_test_suite.retry = True
continue continue
except: except:
log("Errror")
ex_type, ex, tb = sys.exc_info() ex_type, ex, tb = sys.exc_info()
traceback.print_tb(tb) traceback.print_tb(tb)
log("erp5testnode exception", exc_info=sys.exc_info()) log("erp5testnode exception", exc_info=sys.exc_info())
......
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