INTERRUPTED status overwrite fix

When avocado-instrumented test is interrupted, the avocado runner will
call a tearDown method to clean the test environment. If some error is
raised during the tearDown phase, the `INTERRUPTED` status is
overwritten by this error. This is not desired behavior, because the
reason for the error was interruption of the test. This fix keeps
logging of the tearDown error without change of the `INTERRUPTED`
status.

Reference: avocado-framework#5801
Signed-off-by: Jan Richter <jarichte@redhat.com>

avocado/core/test.py

@@ -662,8 +662,9 @@ def _tearDown(self):
             raise
         except:  # avoid old-style exception failures pylint: disable=W0702
             stacktrace.log_exc_info(sys.exc_info(), logger=self.log)
-            details = sys.exc_info()[1]
-            raise exceptions.TestSetupFail(details)
+            if self.status != "INTERRUPTED":
+                details = sys.exc_info()[1]
+                raise exceptions.TestSetupFail(details)
 
     def _setup_environment_variables(self):
         os.environ["AVOCADO_VERSION"] = VERSION

selftests/.data/test_statuses.py

@@ -1,4 +1,5 @@
 import sys
+import time
 
 from avocado import Test, skip
 
@@ -295,3 +296,21 @@ def tearDown(self):
         raise ValueError
         # pylint: disable=W0101
         self.log.info("teardown post")
+
+
+class ExceptionTeardownSleep(Test):
+    def setUp(self):
+        self.log.info("setup pre")
+        self.log.info("setup post")
+
+    def test(self):
+        self.log.info("test pre")
+        time.sleep(10)
+        self.log.info("test post")
+
+    def tearDown(self):
+        self.log.info("teardown pre")
+        self.log.info("teardown status: %s", self.status)
+        raise ValueError
+        # pylint: disable=W0101
+        self.log.info("teardown post")

selftests/functional/statuses.py

@@ -174,6 +174,16 @@
             "teardown status: PASS",
         ],
     ),
+    "ExceptionTeardownSleep.test": (
+        "INTERRUPTED",
+        [
+            "setup pre",
+            "setup post",
+            "test pre",
+            "teardown pre",
+            "teardown status: INTERRUPTED",
+        ],
+    ),
 }
 
 
@@ -187,7 +197,7 @@ def setUp(self):
         )
 
         cmd = (
-            f"{AVOCADO} run {test_file} --disable-sysinfo "
+            f"{AVOCADO} run --job-timeout=5 {test_file} --disable-sysinfo "
             f"--job-results-dir {self.tmpdir.name} --json - "
         )