diff --git a/atest/robot/rebot/merge.robot b/atest/robot/rebot/merge.robot
index b2539d6214a..875877860b2 100644
--- a/atest/robot/rebot/merge.robot
+++ b/atest/robot/rebot/merge.robot
@@ -78,17 +78,20 @@ Using other options
Test merge should have been successful suite name=Custom
Log should have been created with Fail keywords flattened
-Merge ignores skip
+Merge skip result
Create Output With Robot ${ORIGINAL} ${EMPTY} rebot/merge_statuses.robot
Create Output With Robot ${MERGE1} --skip NOTskip rebot/merge_statuses.robot
Run Merge
- ${prefix} = Catenate
- ... *HTML* Test has been re-executed and results merged.
- ... Latter result had SKIP status and was ignored. Message:
+ ${pass msg} = Create expected merge message ${EMPTY}
+ ... SKIP Test skipped using 'NOT skip' tag pattern. PASS ${EMPTY}
+ ${fail msg} = Create expected merge message ${EMPTY}
+ ... SKIP Test skipped using 'NOT skip' tag pattern. FAIL Not <b>HTML</b> fail
+ ${skip msg} = Create expected merge message ${EMPTY}
+ ... SKIP HTML skip SKIP HTML skip
Should Contain Tests ${SUITE}
- ... Pass=PASS:${prefix}\nTest skipped using 'NOT skip' tag pattern.
- ... Fail=FAIL:${prefix}\nTest skipped using 'NOT skip' tag pattern.
Original message:\nNot <b>HTML</b> fail
- ... Skip=SKIP:${prefix}\nHTML skip
Original message:\nHTML skip
+ ... Pass=SKIP:${pass msg}
+ ... Fail=SKIP:${fail msg}
+ ... Skip=SKIP:${skip msg}
*** Keywords ***
Run original tests
@@ -277,8 +280,10 @@ Create expected merge message header
Create expected merge old message body
[Arguments] ${old status} ${old message}
- ${old status} = Set Variable If '${old status}' == 'PASS'
- ... PASS FAIL
+ ${old status} = Set Variable If
+ ... '${old status}' == 'PASS' PASS
+ ... '${old status}' == 'FAIL' FAIL
+ ... SKIP
${old message} = Set Variable If '${old message}' != ''
... ${old message}
${EMPTY}
${old message html achor} = Set Variable If '${old message}' != ''
@@ -289,8 +294,10 @@ Create expected merge old message body
Create expected merge message body
[Arguments] ${new status} ${new message} ${old status} ${old message}
- ${new status} = Set Variable If '${new status}' == 'PASS'
- ... PASS FAIL
+ ${new status} = Set Variable If
+ ... '${new status}' == 'PASS' PASS
+ ... '${new status}' == 'FAIL' FAIL
+ ... SKIP
${new message html achor} = Set Variable If '${new message}' != ''
... New message:${SPACE} ${EMPTY}
${new message} = Set Variable If '${new message}' != ''
diff --git a/src/robot/result/merger.py b/src/robot/result/merger.py
index 320f3530cf2..a723bb061b2 100644
--- a/src/robot/result/merger.py
+++ b/src/robot/result/merger.py
@@ -70,8 +70,6 @@ def visit_test(self, test):
if old is None:
test.message = self._create_add_message(test)
self.current.tests.append(test)
- elif test.skipped:
- old.message = self._create_skip_message(old, test)
else:
test.message = self._create_merge_message(test, old)
index = self.current.tests.index(old)
@@ -129,13 +127,3 @@ def _format_old_status_and_message(self, test, merge_header):
self._message_header("New"),
self._message_header("Old"),
)
-
- def _create_skip_message(self, test, new):
- msg = (
- f"*HTML* {test_or_task('Test', self.rpa)} has been re-executed and "
- f"results merged. Latter result had {self._status_text('SKIP')} "
- f"status and was ignored. Message:\n{self._html(new.message)}"
- )
- if test.message:
- msg += f"
Original message:\n{self._html(test.message)}"
- return msg