Only return exit code 1 when --check is used

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

diff --git a/tests/test_black.py b/tests/test_black.py
index ee883ec011d1be2ea9015cc48fdbe95843a358e4..69746d12f0c117def22796f4050eef55d47304f7 100644 (file)
--- a/tests/test_black.py
+++ b/tests/test_black.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 from functools import partial
 from io import StringIO
 #!/usr/bin/env python3
 from functools import partial
 from io import StringIO

+import os

 from pathlib import Path
 import sys
 from typing import Any, List, Tuple
 from pathlib import Path
 import sys
 from typing import Any, List, Tuple


@@ -47,7 +48,7 @@ class BlackTestCase(unittest.TestCase):
     maxDiff = None
 
     def assertFormatEqual(self, expected: str, actual: str) -> None:
     maxDiff = None
 
     def assertFormatEqual(self, expected: str, actual: str) -> None:

-        if actual != expected:
+        if actual != expected and not os.environ.get('SKIP_AST_PRINT'):

             bdv: black.DebugVisitor[Any]
             black.out('Expected tree:', fg='green')
             try:
             bdv: black.DebugVisitor[Any]
             black.out('Expected tree:', fg='green')
             try:


@@ -89,7 +90,7 @@ class BlackTestCase(unittest.TestCase):
         try:
             sys.stdin, sys.stdout = StringIO(source), StringIO()
             sys.stdin.name = '<stdin>'
         try:
             sys.stdin, sys.stdout = StringIO(source), StringIO()
             sys.stdin.name = '<stdin>'

-            black.format_stdin_to_stdout(line_length=ll, fast=True)
+            black.format_stdin_to_stdout(line_length=ll, fast=True, write_back=True)

             sys.stdout.seek(0)
             actual = sys.stdout.read()
         finally:
             sys.stdout.seek(0)
             actual = sys.stdout.read()
         finally:


@@ -204,7 +205,10 @@ class BlackTestCase(unittest.TestCase):
             self.assertEqual(
                 unstyle(str(report)), '1 file reformatted, 1 file left unchanged.'
             )
             self.assertEqual(
                 unstyle(str(report)), '1 file reformatted, 1 file left unchanged.'
             )

+            self.assertEqual(report.return_code, 0)
+            report.check = True

             self.assertEqual(report.return_code, 1)
             self.assertEqual(report.return_code, 1)

+            report.check = False

             report.failed(Path('e1'), 'boom')
             self.assertEqual(len(out_lines), 2)
             self.assertEqual(len(err_lines), 1)
             report.failed(Path('e1'), 'boom')
             self.assertEqual(len(out_lines), 2)
             self.assertEqual(len(err_lines), 1)


@@ -245,6 +249,12 @@ class BlackTestCase(unittest.TestCase):
                 '2 files failed to reformat.',
             )
             self.assertEqual(report.return_code, 123)
                 '2 files failed to reformat.',
             )
             self.assertEqual(report.return_code, 123)

+            report.check = True
+            self.assertEqual(
+                unstyle(str(report)),
+                '2 files would be reformatted, 2 files would be left unchanged, '
+                '2 files would fail to reformat.',
+            )

 
     def test_is_python36(self) -> None:
         node = black.lib2to3_parse("def f(*, arg): ...\n")
 
     def test_is_python36(self) -> None:
         node = black.lib2to3_parse("def f(*, arg): ...\n")