Use overwrite_union_syntax for test configs

Author: cdce8p

mypy/test/helpers.py

@@ -357,7 +357,7 @@ def parse_options(
         options = Options()
         options.error_summary = False
         options.hide_error_codes = True
-        options.force_union_syntax = True
+        options.overwrite_union_syntax = True
 
     # Allow custom python version to override testfile_pyversion.
     if all(flag.split("=")[0] != "--python-version" for flag in flag_list):

mypy/test/testcheck.py

@@ -136,6 +136,7 @@ def run_case_once(
         options = parse_options(original_program_text, testcase, incremental_step)
         options.use_builtins_fixtures = True
         options.show_traceback = True
+        options.overwrite_union_syntax = True
 
         if options.num_workers:
             options.fixed_format_cache = True
@@ -151,8 +152,6 @@ def run_case_once(
             options.hide_error_codes = False
         if "abstract" not in testcase.file:
             options.allow_empty_bodies = not testcase.name.endswith("_no_empty")
-        if "union-error" not in testcase.file and "Pep604" not in testcase.name:
-            options.force_union_syntax = True
 
         if incremental_step and options.incremental or options.num_workers > 0:
             # Don't overwrite # flags: --no-incremental in incremental test cases

mypy/test/testfinegrained.py

@@ -152,6 +152,7 @@ def get_options(self, source: str, testcase: DataDrivenTestCase, build_cache: bo
         options.use_fine_grained_cache = self.use_cache and not build_cache
         options.cache_fine_grained = self.use_cache
         options.local_partial_types = True
+        options.overwrite_union_syntax = True
         options.export_types = "inspect" in testcase.file
         # Treat empty bodies safely for these test cases.
         options.allow_empty_bodies = not testcase.name.endswith("_no_empty")

mypy/test/testmerge.py

@@ -102,6 +102,7 @@ def build(self, source: str, testcase: DataDrivenTestCase) -> BuildResult | None
         options.export_types = True
         options.show_traceback = True
         options.allow_empty_bodies = True
+        options.overwrite_union_syntax = True
         main_path = os.path.join(test_temp_dir, "main")
 
         self.str_conv.options = options

mypy/test/testparse.py

@@ -38,6 +38,7 @@ def test_parser(testcase: DataDrivenTestCase) -> None:
     The argument contains the description of the test case.
     """
     options = Options()
+    options.overwrite_union_syntax = True
     options.hide_error_codes = True
 
     if testcase.file.endswith("python310.test"):

mypy/test/testsemanal.py

@@ -38,6 +38,7 @@ def get_semanal_options(program_text: str, testcase: DataDrivenTestCase) -> Opti
     options.semantic_analysis_only = True
     options.show_traceback = True
     options.python_version = PYTHON3_VERSION
+    options.overwrite_union_syntax = True
     return options
 
 

mypy/test/testtransform.py

@@ -38,6 +38,7 @@ def test_transform(testcase: DataDrivenTestCase) -> None:
         options.use_builtins_fixtures = True
         options.semantic_analysis_only = True
         options.show_traceback = True
+        options.overwrite_union_syntax = True
         result = build.build(
             sources=[BuildSource("main", None, src)], options=options, alt_lib_path=test_temp_dir
         )

mypy/test/testtypegen.py

@@ -35,6 +35,7 @@ def run_case(self, testcase: DataDrivenTestCase) -> None:
             options.export_types = True
             options.preserve_asts = True
             options.allow_empty_bodies = True
+            options.overwrite_union_syntax = True
             result = build.build(
                 sources=[BuildSource("main", None, src)],
                 options=options,