Skip to content

Commit e7ab0b6

Browse files
committed
MQE-1068: Require Issue ID for Skipped Test
- Added reason and description to skip tag
1 parent cb5f51b commit e7ab0b6

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

dev/tests/verification/TestModule/Test/SkippedTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<title value="skippedTest"/>
1515
<description value=""/>
1616
<severity value="AVERAGE"/>
17-
<skip>
17+
<skip reason="CORE_ISSUE" description="Information">
1818
<issueId value="SkippedValue"/>
1919
</skip>
2020
</annotations>
@@ -25,7 +25,7 @@
2525
<title value="skippedMultipleIssuesTest"/>
2626
<description value=""/>
2727
<severity value="AVERAGE"/>
28-
<skip>
28+
<skip reason="MFTF_ISSUE">
2929
<issueId value="SkippedValue"/>
3030
<issueId value="SecondSkippedValue"/>
3131
</skip>

dev/tests/verification/TestModuleMerged/Test/MergeFunctionalTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</test>
2929
<test name="MergeSkip">
3030
<annotations>
31-
<skip>
31+
<skip reason="UNKNOWN" description="Short Explanation">
3232
<issueId value="Issue5"/>
3333
</skip>
3434
</annotations>

src/Magento/FunctionalTestingFramework/Test/etc/mergedTestSchema.xsd

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,15 @@
4242
<xs:enumeration value="CRITICAL"/>
4343
</xs:restriction>
4444
</xs:simpleType>
45+
<xs:simpleType name="skippedReasonEnum" final="restriction">
46+
<xs:restriction base="xs:string">
47+
<xs:enumeration value="CORE_ISSUE"/>
48+
<xs:enumeration value="MFTF_ISSUE"/>
49+
<xs:enumeration value="UNKNOWN"/>
50+
<xs:enumeration value="OTHER"/>
51+
<xs:enumeration value="NONE"/>
52+
</xs:restriction>
53+
</xs:simpleType>
4554
<xs:complexType name="annotationType">
4655
<xs:simpleContent>
4756
<xs:extension base="xs:string">
@@ -60,6 +69,8 @@
6069
<xs:sequence maxOccurs="unbounded">
6170
<xs:element type="issueType" name="issueId" maxOccurs="unbounded"/>
6271
</xs:sequence>
72+
<xs:attribute type="skippedReasonEnum" name="reason" use="required"/>
73+
<xs:attribute type="xs:string" name="description"/>
6374
</xs:complexType>
6475
<xs:complexType name="issueType">
6576
<xs:simpleContent>

0 commit comments

Comments
 (0)