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
(cherry picked from commit fd3c9ef6dd
)
This commit is contained in:
parent
bfcdb7cc29
commit
77a1d1bb3b
|
@ -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]),
|
||||
|
|
|
@ -102,7 +102,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]),
|
||||
|
|
|
@ -44,11 +44,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(_LI("Copying logs..."))
|
||||
fn = exec_info[2].tb_frame.f_locals['fn']
|
||||
func_name = fn.im_self._get_test_method().__name__
|
||||
func_name = "test"
|
||||
msg = (_LE("Failed to copy logs for cluster"))
|
||||
nodes_addresses = get_nodes_fn()
|
||||
|
||||
|
|
|
@ -272,8 +272,9 @@ extendedKeyUsage = clientAuth
|
|||
|
||||
self.useFixture(fixtures.Timeout(test_timeout, gentle=True))
|
||||
|
||||
# Copy cluster nodes logs
|
||||
if self.copy_logs:
|
||||
self.addOnException(
|
||||
self.addCleanup(
|
||||
self.copy_logs_handler(
|
||||
self._get_nodes,
|
||||
self.cluster_template.coe,
|
||||
|
|
Loading…
Reference in New Issue