Also run mypy on test_black.py

diff --git a/.travis.yml b/.travis.yml
index 5870f83b0ab7be693d964c92b324f003f9d887e1..804b39d7f0c1ab7fcd672679e3a124dcf27adefa 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ before_script:
 - pip install -e .
 script:
 - python setup.py test
 - pip install -e .
 script:
 - python setup.py test

-- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then mypy black.py; fi
+- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then mypy black.py tests/test_black.py; fi

 notifications:
   on_success: change
   on_failure: always
 notifications:
   on_success: change
   on_failure: always

diff --git a/tests/test_black.py b/tests/test_black.py
index 1dda5fc963de828384e656d31894cbf379ac01c0..c11fca0a9019fcaf5fbfa474c1f370e476ef7f1a 100644 (file)
--- a/tests/test_black.py
+++ b/tests/test_black.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 from functools import partial
 from pathlib import Path
 #!/usr/bin/env python3
 from functools import partial
 from pathlib import Path

-from typing import List, Tuple
+from typing import Any, List, Tuple

 import unittest
 from unittest.mock import patch
 
 import unittest
 from unittest.mock import patch
 


@@ -46,6 +46,7 @@ class BlackTestCase(unittest.TestCase):
 
     def assertFormatEqual(self, expected: str, actual: str) -> None:
         if actual != expected:
 
     def assertFormatEqual(self, expected: str, actual: str) -> None:
         if actual != expected:

+            bdv: black.DebugVisitor[Any]

             black.out('Expected tree:', fg='green')
             try:
                 exp_node = black.lib2to3_parse(expected)
             black.out('Expected tree:', fg='green')
             try:
                 exp_node = black.lib2to3_parse(expected)


@@ -161,10 +162,10 @@ class BlackTestCase(unittest.TestCase):
         out_lines = []
         err_lines = []
 
         out_lines = []
         err_lines = []
 

-        def out(msg: str, **kwargs):
+        def out(msg: str, **kwargs: Any) -> None:

             out_lines.append(msg)
 
             out_lines.append(msg)
 

-        def err(msg: str, **kwargs):
+        def err(msg: str, **kwargs: Any) -> None:

             err_lines.append(msg)
 
         with patch("black.out", out), patch("black.err", err):
             err_lines.append(msg)
 
         with patch("black.out", out), patch("black.err", err):


@@ -223,7 +224,7 @@ class BlackTestCase(unittest.TestCase):
             )
             self.assertEqual(report.return_code, 123)
 
             )
             self.assertEqual(report.return_code, 123)
 

-    def test_is_python36(self):
+    def test_is_python36(self) -> None:

         node = black.lib2to3_parse("def f(*, arg): ...\n")
         self.assertFalse(black.is_python36(node))
         node = black.lib2to3_parse("def f(*, arg,): ...\n")
         node = black.lib2to3_parse("def f(*, arg): ...\n")
         self.assertFalse(black.is_python36(node))
         node = black.lib2to3_parse("def f(*, arg,): ...\n")