Edit error marker comments on some tests (#2048)

* edit error markers and regenerate results

* Add back newline

* Add back newline

---------

Co-authored-by: Rebecca Chen <[email protected]>

Author: yangdanny97

conformance/results/mypy/enums_behaviors.toml

@@ -2,6 +2,8 @@ conformant = "Pass"
 errors_diff = """
 """
 output = """
-enums_behaviors.py:39: error: Cannot extend enum with existing members: "Shape"  [misc]
+enums_behaviors.py:28: error: Expression is of type "Color", not "Literal[Color.RED]"  [assert-type]
+enums_behaviors.py:32: error: Expression is of type "Color", not "Literal[Color.BLUE]"  [assert-type]
+enums_behaviors.py:44: error: Cannot extend enum with existing members: "Shape"  [misc]
 """
 conformance_automated = "Pass"

conformance/results/mypy/version.toml

@@ -1,2 +1,2 @@
 version = "mypy 1.17.0"
-test_duration = 2.7
+test_duration = 1.9

conformance/results/pyre/enums_behaviors.toml

@@ -5,5 +5,7 @@ conformance_automated = "Pass"
 errors_diff = """
 """
 output = """
-enums_behaviors.py:39:0 Invalid inheritance [39]: Cannot inherit from final enum `Shape`. Enums with defined members cannot be extended.
+enums_behaviors.py:28:0 Assert type [70]: Expected `typing_extensions.Literal[Color.RED]` but got `Color`.
+enums_behaviors.py:32:0 Assert type [70]: Expected `typing_extensions.Literal[Color.BLUE]` but got `Color`.
+enums_behaviors.py:44:0 Invalid inheritance [39]: Cannot inherit from final enum `Shape`. Enums with defined members cannot be extended.
 """

conformance/results/pyre/qualifiers_final_decorator.toml

@@ -18,7 +18,7 @@ qualifiers_final_decorator.py:126:0 Invalid inheritance [39]: `final` cannot be
 """
 conformance_automated = "Fail"
 errors_diff = """
-Lines 80, 89: Expected error (tag 'Derived3')
-Lines 94, 102: Expected error (tag 'Derived4')
+Lines 80, 81, 89: Expected error (tag 'Derived3')
+Lines 94, 95, 102: Expected error (tag 'Derived4')
 Line 51: Unexpected errors ['qualifiers_final_decorator.py:51:4 Incompatible overload [43]: This definition does not have the same decorators as the preceding overload(s).']
 """

conformance/results/pyre/version.toml

@@ -1,2 +1,2 @@
 version = "pyre 0.9.25"
-test_duration = 3.9
+test_duration = 7.4

conformance/results/pyright/enums_behaviors.toml

@@ -2,6 +2,8 @@ conformant = "Pass"
 errors_diff = """
 """
 output = """
-enums_behaviors.py:39:21 - error: Enum class "Shape" is final and cannot be subclassed (reportGeneralTypeIssues)
+enums_behaviors.py:28:13 - error: "assert_type" mismatch: expected "Literal[Color.RED]" but received "Color" (reportAssertTypeFailure)
+enums_behaviors.py:32:13 - error: "assert_type" mismatch: expected "Literal[Color.BLUE]" but received "Color" (reportAssertTypeFailure)
+enums_behaviors.py:44:21 - error: Enum class "Shape" is final and cannot be subclassed (reportGeneralTypeIssues)
 """
 conformance_automated = "Pass"

conformance/results/pyright/version.toml

@@ -1,2 +1,2 @@
 version = "pyright 1.1.403"
-test_duration = 5.6
+test_duration = 1.4

conformance/results/results.html

@@ -159,13 +159,13 @@ <h3>Python Type System Conformance Test Results</h3>
         <div class="table_container"><table><tbody>
 <tr><th class="col1">&nbsp;</th>
 <th class='tc-header'><div class='tc-name'>mypy 1.17.0</div>
-<div class='tc-time'>2.7sec</div>
+<div class='tc-time'>1.9sec</div>
 </th>
 <th class='tc-header'><div class='tc-name'>pyright 1.1.403</div>
-<div class='tc-time'>5.6sec</div>
+<div class='tc-time'>1.4sec</div>
 </th>
 <th class='tc-header'><div class='tc-name'>pyre 0.9.25</div>
-<div class='tc-time'>3.9sec</div>
+<div class='tc-time'>7.4sec</div>
 </th>
 </tr>
 <tr><th class="column" colspan="4">

conformance/tests/enums_behaviors.py

@@ -5,7 +5,7 @@
 # Specification: https://typing.readthedocs.io/en/latest/spec/enums.html#enum-definition
 
 from enum import Enum
-from typing import assert_type
+from typing import assert_type, Literal
 
 # > Enum classes are iterable and indexable, and they can be called with a
 # > value to look up the enum member with that value. Type checkers should
@@ -23,8 +23,13 @@ class Color(Enum):
 # > constructor. Instead, the call performs a value-based lookup of an
 # > enum member.
 
-assert_type(Color["RED"], Color)  # 'Literal[Color.RED]' is also acceptable
-assert_type(Color(3), Color)  # 'Literal[Color.BLUE]' is also acceptable
+# 'Literal[Color.RED]' and 'Color' are both acceptable
+assert_type(Color["RED"], Color)  # E[red]
+assert_type(Color["RED"], Literal[Color.RED])  # E[red]
+
+# 'Literal[Color.BLUE]' and 'Color' are both acceptable
+assert_type(Color(3), Color)  # E[blue]
+assert_type(Color(3), Literal[Color.BLUE])  # E[blue]
 
 
 # > An Enum class with one or more defined members cannot be subclassed.

conformance/tests/qualifiers_final_decorator.py

@@ -65,7 +65,7 @@ def method3() -> None:  # E[method3]
         pass
 
     @overload  # E[method4]
-    def method4(self, x: int) -> int:
+    def method4(self, x: int) -> int:  # E[method4]
         ...
 
     @overload
@@ -78,7 +78,7 @@ def method4(self, x: int | str) -> int | str:  # E[method4]
 
 class Derived3(Base3):
     @overload  # E[Derived3]
-    def method(self, x: int) -> int:
+    def method(self, x: int) -> int:  # E[Derived3]
         ...
 
     @overload  # E[Derived3-2]
@@ -92,7 +92,7 @@ def method(self, x: int | str) -> int | str:  # E[Derived3]
 
 class Derived4(Base4):
     @overload  # E[Derived4]
-    def method(self, x: int) -> int:
+    def method(self, x: int) -> int:  # E[Derived4]
         ...
 
     @overload