Fix a string merging/split issue caused by standalone comments. (#3227)

[etc/vim.git] / tests / test_format.py

diff --git a/tests/test_format.py b/tests/test_format.py
index 86339f24b864e153b70b7d0f32e75dea6b4f7ac4..01cd61eef63dee3272e156d5e5700ad9f4152eda 100644 (file)
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -8,10 +8,10 @@ import black
 from tests.util import (
     DEFAULT_MODE,
     PY36_VERSIONS,
 from tests.util import (
     DEFAULT_MODE,
     PY36_VERSIONS,

+    all_data_cases,

     assert_format,
     dump_to_stderr,
     read_data,
     assert_format,
     dump_to_stderr,
     read_data,

-    all_data_cases,

 )
 
 
 )
 
 


@@ -28,6 +28,7 @@ def check_file(
     assert_format(source, expected, mode, fast=False)
 
 
     assert_format(source, expected, mode, fast=False)
 
 

+@pytest.mark.filterwarnings("ignore:invalid escape sequence.*:DeprecationWarning")

 @pytest.mark.parametrize("filename", all_data_cases("simple_cases"))
 def test_simple_format(filename: str) -> None:
     check_file("simple_cases", filename, DEFAULT_MODE)
 @pytest.mark.parametrize("filename", all_data_cases("simple_cases"))
 def test_simple_format(filename: str) -> None:
     check_file("simple_cases", filename, DEFAULT_MODE)


@@ -35,7 +36,12 @@ def test_simple_format(filename: str) -> None:
 
 @pytest.mark.parametrize("filename", all_data_cases("preview"))
 def test_preview_format(filename: str) -> None:
 
 @pytest.mark.parametrize("filename", all_data_cases("preview"))
 def test_preview_format(filename: str) -> None:

-    check_file("preview", filename, black.Mode(preview=True))
+    magic_trailing_comma = filename != "skip_magic_trailing_comma"
+    check_file(
+        "preview",
+        filename,
+        black.Mode(preview=True, magic_trailing_comma=magic_trailing_comma),
+    )

 
 
 @pytest.mark.parametrize("filename", all_data_cases("preview_39"))
 
 
 @pytest.mark.parametrize("filename", all_data_cases("preview_39"))


@@ -132,6 +138,7 @@ def test_python_2_hint() -> None:
     exc_info.match(black.parsing.PY2_HINT)
 
 
     exc_info.match(black.parsing.PY2_HINT)
 
 

+@pytest.mark.filterwarnings("ignore:invalid escape sequence.*:DeprecationWarning")

 def test_docstring_no_string_normalization() -> None:
     """Like test_docstring but with string normalization off."""
     source, expected = read_data("miscellaneous", "docstring_no_string_normalization")
 def test_docstring_no_string_normalization() -> None:
     """Like test_docstring but with string normalization off."""
     source, expected = read_data("miscellaneous", "docstring_no_string_normalization")