Copy cluster nodes logs always whether tests pass or fail
- Use addOnCleanup instead of addOnException. This will make copy logs to run whether tests pass or fail. - Also try to copy logs if setupClass Fails. Change-Id: I76b135ade4c1ed4987f9bcbe1d5ded09ad57deb9
This commit is contained in:
parent
1cd00ef9e2
commit
6fb2741a95
|
@ -107,7 +107,7 @@ class BayTest(base.BaseTempestTest):
|
||||||
self.bays.append(model.uuid)
|
self.bays.append(model.uuid)
|
||||||
self.bay_uuid = model.uuid
|
self.bay_uuid = model.uuid
|
||||||
if config.Config.copy_logs:
|
if config.Config.copy_logs:
|
||||||
self.addOnException(self.copy_logs_handler(
|
self.addCleanup(self.copy_logs_handler(
|
||||||
lambda: list(
|
lambda: list(
|
||||||
[self._get_bay_by_id(self.bay_uuid)[1].master_addresses,
|
[self._get_bay_by_id(self.bay_uuid)[1].master_addresses,
|
||||||
self._get_bay_by_id(self.bay_uuid)[1].node_addresses]),
|
self._get_bay_by_id(self.bay_uuid)[1].node_addresses]),
|
||||||
|
|
|
@ -107,7 +107,7 @@ class ClusterTest(base.BaseTempestTest):
|
||||||
self.clusters.append(model.uuid)
|
self.clusters.append(model.uuid)
|
||||||
self.cluster_uuid = model.uuid
|
self.cluster_uuid = model.uuid
|
||||||
if config.Config.copy_logs:
|
if config.Config.copy_logs:
|
||||||
self.addOnException(self.copy_logs_handler(
|
self.addCleanup(self.copy_logs_handler(
|
||||||
lambda: list(
|
lambda: list(
|
||||||
[self._get_cluster_by_id(model.uuid)[1].master_addresses,
|
[self._get_cluster_by_id(model.uuid)[1].master_addresses,
|
||||||
self._get_cluster_by_id(model.uuid)[1].node_addresses]),
|
self._get_cluster_by_id(model.uuid)[1].node_addresses]),
|
||||||
|
|
|
@ -42,11 +42,10 @@ class BaseMagnumTest(base.BaseTestCase):
|
||||||
[[master_nodes], [slave_nodes]].
|
[[master_nodes], [slave_nodes]].
|
||||||
:param coe: the COE type of the nodes
|
:param coe: the COE type of the nodes
|
||||||
"""
|
"""
|
||||||
def int_copy_logs(exec_info):
|
def int_copy_logs():
|
||||||
try:
|
try:
|
||||||
cls.LOG.info("Copying logs...")
|
cls.LOG.info("Copying logs...")
|
||||||
fn = exec_info[2].tb_frame.f_locals['fn']
|
func_name = "test"
|
||||||
func_name = fn.im_self._get_test_method().__name__
|
|
||||||
msg = ("Failed to copy logs for cluster")
|
msg = ("Failed to copy logs for cluster")
|
||||||
nodes_addresses = get_nodes_fn()
|
nodes_addresses = get_nodes_fn()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue