Refactor to ResultInterpret

docs/releases.rst

@@ -51,9 +51,9 @@ backed by :ref:`prepare/feature</plugins/prepare/feature>` plugin.
 
 +A new ``check-result`` key has been added to the test specification. This key
 +allows users to configure whether "check" failure will affect the test result.
-+The key accepts two options: 'respect' (default) and 'ignore'. When set to
++The key accepts two options: 'respect' (default) and 'skip'. When set to
 +'respect', check failures will affect the test result as before. When set to
-+'ignore', check failures will not affect the overall test result.
++'skip', check failures will not affect the overall test result.
 
 
 tmt-1.36.1

spec/tests/result.fmf

@@ -37,7 +37,7 @@ description: |
 
     respect
         check results are respected (test fails if any check fails) - default value
-    ignore
+    skip
         check results are ignored (test result is not affected by check failures)
 
         .. versionadded:: 1.37
@@ -53,7 +53,7 @@ example:
 
   - |
     # Ignore check failures
-    check-result: ignore
+    check-result: skip
 
 link:
   - implemented-by: /tmt/base.py

tests/execute/result/check_results.sh

@@ -22,14 +22,14 @@ rlJournalStart
         rlAssertGrep "fail dmesg (after-test check)" $rlRun_LOG
         rlAssertGrep "check failed" $rlRun_LOG
 
-        rlRun -s "tmt run --id \${run} --scratch provision --how local test --name /test/check-fail-ignore execute -vv report -vv 2>&1 >/dev/null" 0
-        rlAssertGrep "pass /test/check-fail-ignore" $rlRun_LOG
+        rlRun -s "tmt run --id \${run} --scratch provision --how local test --name /test/check-fail-skip execute -vv report -vv 2>&1 >/dev/null" 0
+        rlAssertGrep "pass /test/check-fail-skip" $rlRun_LOG
         rlAssertGrep "pass dmesg (before-test check)" $rlRun_LOG
         rlAssertGrep "fail dmesg (after-test check)" $rlRun_LOG
         rlAssertNotGrep "check failed" $rlRun_LOG
 
-        rlRun -s "tmt run --id \${run} --scratch provision --how local test --name /test/check-ignore execute -vv report -vv 2>&1 >/dev/null" 0
-        rlAssertGrep "pass /test/check-ignore" $rlRun_LOG
+        rlRun -s "tmt run --id \${run} --scratch provision --how local test --name /test/check-skip execute -vv report -vv 2>&1 >/dev/null" 0
+        rlAssertGrep "pass /test/check-skip" $rlRun_LOG
         rlAssertGrep "pass dmesg (before-test check)" $rlRun_LOG
         rlAssertGrep "fail dmesg (after-test check)" $rlRun_LOG
         rlAssertNotGrep "check failed" $rlRun_LOG
@@ -65,7 +65,7 @@ rlJournalStart
         rlAssertGrep "check_result: respect" $rlRun_LOG
 
         rlRun -s "yq e '.[2]' $results_file"
-        rlAssertGrep "name: /test/check-fail-ignore" $rlRun_LOG
+        rlAssertGrep "name: /test/check-fail-skip" $rlRun_LOG
         rlAssertGrep "result: pass" $rlRun_LOG
         rlAssertNotGrep "note: check failed" $rlRun_LOG
         rlAssertGrep "check:" $rlRun_LOG
@@ -75,10 +75,10 @@ rlJournalStart
         rlAssertGrep "- name: dmesg" $rlRun_LOG
         rlAssertGrep "  result: fail" $rlRun_LOG
         rlAssertGrep "  event: after-test" $rlRun_LOG
-        rlAssertGrep "check_result: ignore" $rlRun_LOG
+        rlAssertGrep "check_result: skip" $rlRun_LOG
 
         rlRun -s "yq e '.[3]' $results_file"
-        rlAssertGrep "name: /test/check-ignore" $rlRun_LOG
+        rlAssertGrep "name: /test/check-skip" $rlRun_LOG
         rlAssertGrep "result: pass" $rlRun_LOG
         rlAssertNotGrep "note: check failed" $rlRun_LOG
         rlAssertGrep "check:" $rlRun_LOG

tests/execute/result/check_results/main.fmf

@@ -23,19 +23,19 @@ description: Verify that check results, including after-test checks, are correct
     check-result: respect
     # Expected outcome: FAIL (test passes, but check fails and is respected)
 
-/test/check-fail-ignore:
-    summary: Test with failing dmesg check (ignore)
+/test/check-fail-skip:
+    summary: Test with failing dmesg check (skip)
     test: |
         echo "Test passed"
         echo "Call Trace:" >> /dev/kmsg
     framework: shell
     duration: 1m
     check:
         - how: dmesg
-    check-result: ignore
+    check-result: skip
     # Expected outcome: PASS (test passes, check fails but is ignored)
 
-/test/check-ignore:
+/test/check-skip:
     summary: Test with failing dmesg check but ignored due to result interpretation
     test: |
         echo "Test passed"

tmt/base.py

@@ -1346,6 +1346,9 @@ def show(self) -> None:
                     [check.to_spec() for check in cast(list[Check], value)]
                     ))
                 continue
+            if key == 'check_result':
+                echo(tmt.utils.format(key, value))
+                continue
             if value not in [None, [], {}]:
                 echo(tmt.utils.format(key, value))
         if self.verbosity_level:

tmt/result.py

@@ -237,11 +237,6 @@ class Result(BaseResult):
         serialize=lambda path: None if path is None else str(path),
         unserialize=lambda value: None if value is None else Path(value)
         )
-    check_result: str = field(
-        default='respect',
-        serialize=lambda value: value,
-        unserialize=lambda value: value
-        )
 
     @classmethod
     def from_test_invocation(
@@ -286,8 +281,6 @@ def from_test_invocation(
         default_ids.update(ids)
         ids = default_ids
 
-        check_result = cast(str, invocation.test.node.get('check-result', 'respect'))
-
         _result = Result(
             name=invocation.test.name,
             serial_number=invocation.test.serial_number,
@@ -302,23 +295,30 @@ def from_test_invocation(
             log=log or [],
             guest=ResultGuestData.from_test_invocation(invocation=invocation),
             data_path=invocation.relative_test_data_path,
-            check_result=check_result,
             check=invocation.check_results)
 
         for check in _result.check:
             print(f"  - Name: {check.name}, Result: {check.result}, Event: {check.event}")
 
-        return _result.interpret_result(ResultInterpret(
-            invocation.test.result) if invocation.test.result else ResultInterpret.RESPECT)
-
-    def interpret_result(self, interpret: ResultInterpret) -> 'Result':
+        return _result.interpret_result(
+            ResultInterpret(invocation.test.result)
+            if invocation.test.result else ResultInterpret.RESPECT,
+            ResultInterpret(invocation.test.check_result)
+            if invocation.test.check_result else ResultInterpret.RESPECT
+            )
+
+    def interpret_result(
+            self,
+            interpret: ResultInterpret,
+            check_interpret: ResultInterpret) -> 'Result':
         """
         Interpret result according to a given interpretation instruction.
 
         Inspect and possibly modify :py:attr:`result` and :py:attr:`note`
         attributes, following the ``interpret`` value.
 
         :param interpret: how to interpret current result.
+        :param check_interpret: how to interpret check results.
         :returns: :py:class:`Result` instance containing the updated result.
         """
 
@@ -329,7 +329,7 @@ def interpret_result(self, interpret: ResultInterpret) -> 'Result':
         checks_failed = any(check.result == ResultOutcome.FAIL for check in self.check)
 
         if interpret == ResultInterpret.RESPECT:
-            if self.check_result == 'respect' and checks_failed:
+            if check_interpret == ResultInterpret.RESPECT and checks_failed:
                 self.result = ResultOutcome.FAIL
                 if self.note:
                     self.note += ', check failed'

tmt/schemas/test.yaml

@@ -66,7 +66,7 @@ properties:
     type: string
     enum:
       - respect
-      - ignore
+      - skip
     default: respect
 
   # https://tmt.readthedocs.io/en/stable/spec/core.html#id