Merge "Copy cluster nodes logs always whether tests pass or fail"

This commit is contained in:
Jenkins 2017-07-19 12:10:52 +00:00 committed by Gerrit Code Review
commit 6f9ea28d71
3 changed files with 4 additions and 5 deletions

View File

@ -107,7 +107,7 @@ class BayTest(base.BaseTempestTest):
self.bays.append(model.uuid)
self.bay_uuid = model.uuid
if config.Config.copy_logs:
self.addOnException(self.copy_logs_handler(
self.addCleanup(self.copy_logs_handler(
lambda: list(
[self._get_bay_by_id(self.bay_uuid)[1].master_addresses,
self._get_bay_by_id(self.bay_uuid)[1].node_addresses]),

View File

@ -107,7 +107,7 @@ class ClusterTest(base.BaseTempestTest):
self.clusters.append(model.uuid)
self.cluster_uuid = model.uuid
if config.Config.copy_logs:
self.addOnException(self.copy_logs_handler(
self.addCleanup(self.copy_logs_handler(
lambda: list(
[self._get_cluster_by_id(model.uuid)[1].master_addresses,
self._get_cluster_by_id(model.uuid)[1].node_addresses]),

View File

@ -42,11 +42,10 @@ class BaseMagnumTest(base.BaseTestCase):
[[master_nodes], [slave_nodes]].
:param coe: the COE type of the nodes
"""
def int_copy_logs(exec_info):
def int_copy_logs():
try:
cls.LOG.info("Copying logs...")
fn = exec_info[2].tb_frame.f_locals['fn']
func_name = fn.im_self._get_test_method().__name__
func_name = "test"
msg = ("Failed to copy logs for cluster")
nodes_addresses = get_nodes_fn()