From 21055d975318b84d1802e17a61e615866e0e698d Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Mon, 8 Apr 2024 09:01:01 -0400 Subject: [PATCH] Conformance test suite: Fix automation discrepancies in directives_version_platform (#1685) --- conformance/results/mypy/directives_version_platform.toml | 6 +----- conformance/results/pyre/directives_version_platform.toml | 2 -- .../results/pytype/directives_version_platform.toml | 5 +---- conformance/tests/directives_version_platform.py | 8 ++++---- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/conformance/results/mypy/directives_version_platform.toml b/conformance/results/mypy/directives_version_platform.toml index 29b10c8ac..7396a9dce 100644 --- a/conformance/results/mypy/directives_version_platform.toml +++ b/conformance/results/mypy/directives_version_platform.toml @@ -9,10 +9,6 @@ directives_version_platform.py:27: error: Incompatible types in assignment (expr directives_version_platform.py:40: error: Incompatible types in assignment (expression has type "str", variable has type "int") [assignment] directives_version_platform.py:45: error: Incompatible types in assignment (expression has type "str", variable has type "int") [assignment] """ -conformance_automated = "Fail" +conformance_automated = "Pass" errors_diff = """ -Line 19: Unexpected errors ['directives_version_platform.py:19: error: Incompatible types in assignment (expression has type "str", variable has type "int") [assignment]'] -Line 27: Unexpected errors ['directives_version_platform.py:27: error: Incompatible types in assignment (expression has type "str", variable has type "int") [assignment]'] -Line 40: Unexpected errors ['directives_version_platform.py:40: error: Incompatible types in assignment (expression has type "str", variable has type "int") [assignment]'] -Line 45: Unexpected errors ['directives_version_platform.py:45: error: Incompatible types in assignment (expression has type "str", variable has type "int") [assignment]'] """ diff --git a/conformance/results/pyre/directives_version_platform.toml b/conformance/results/pyre/directives_version_platform.toml index fde74f498..24d9f1ea7 100644 --- a/conformance/results/pyre/directives_version_platform.toml +++ b/conformance/results/pyre/directives_version_platform.toml @@ -13,6 +13,4 @@ conformance_automated = "Fail" errors_diff = """ Line 31: Unexpected errors ['directives_version_platform.py:31:4 Incompatible variable type [9]: val5 is declared to have type `int` but is used as type `str`.'] Line 36: Unexpected errors ['directives_version_platform.py:36:4 Incompatible variable type [9]: val6 is declared to have type `int` but is used as type `str`.'] -Line 40: Unexpected errors ['directives_version_platform.py:40:4 Incompatible variable type [9]: val7 is declared to have type `int` but is used as type `str`.'] -Line 45: Unexpected errors ['directives_version_platform.py:45:4 Incompatible variable type [9]: val8 is declared to have type `int` but is used as type `str`.'] """ diff --git a/conformance/results/pytype/directives_version_platform.toml b/conformance/results/pytype/directives_version_platform.toml index 49a20192d..6d9473c7f 100644 --- a/conformance/results/pytype/directives_version_platform.toml +++ b/conformance/results/pytype/directives_version_platform.toml @@ -8,9 +8,6 @@ File "directives_version_platform.py", line 27, in : Type annotation for File "directives_version_platform.py", line 40, in : Type annotation for val7 does not match type of assignment [annotation-type-mismatch] File "directives_version_platform.py", line 45, in : Type annotation for val8 does not match type of assignment [annotation-type-mismatch] """ -conformance_automated = "Fail" +conformance_automated = "Pass" errors_diff = """ -Line 27: Unexpected errors ['File "directives_version_platform.py", line 27, in : Type annotation for val3 does not match type of assignment [annotation-type-mismatch]'] -Line 40: Unexpected errors ['File "directives_version_platform.py", line 40, in : Type annotation for val7 does not match type of assignment [annotation-type-mismatch]'] -Line 45: Unexpected errors ['File "directives_version_platform.py", line 45, in : Type annotation for val8 does not match type of assignment [annotation-type-mismatch]'] """ diff --git a/conformance/tests/directives_version_platform.py b/conformance/tests/directives_version_platform.py index 52278a38a..2ffc85cda 100644 --- a/conformance/tests/directives_version_platform.py +++ b/conformance/tests/directives_version_platform.py @@ -16,7 +16,7 @@ if sys.version_info >= (3, 8, 0): pass else: - val2: int = "" # Should not generate an error + val2: int = "" # E?: May not generate an error (support for three-element sys.version is optional) if sys.version_info < (3, 8): val3: int = "" # Should not generate an error @@ -24,7 +24,7 @@ if sys.version_info < (3, 100, 0): pass else: - val3: int = "" # Should not generate an error + val3: int = "" # E?: May not generate an error (support for three-element sys.version is optional) if sys.platform == "bogus_platform": @@ -37,9 +37,9 @@ if os.name == "bogus_os": - val7: int = "" # Should not generate an error + val7: int = "" # E?: May not generate an error (support for os.name is optional) if os.name != "bogus_platform": pass else: - val8: int = "" # Should not generate an error + val8: int = "" # E?: May not generate an error (support for os.name is optional)