]>
git.madduck.net Git - etc/vim.git/blobdiff - tests/test_black.py
madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@ git. madduck. net .
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged .
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
fobj.write("print('hello')")
self.invokeBlack([str(src)])
cache = black.read_cache(mode)
fobj.write("print('hello')")
self.invokeBlack([str(src)])
cache = black.read_cache(mode)
- self.assertIn(src , cache)
+ self.assertIn(str(src) , cache)
def test_cache_single_file_already_cached(self) -> None:
mode = DEFAULT_MODE
def test_cache_single_file_already_cached(self) -> None:
mode = DEFAULT_MODE
with two.open("r") as fobj:
self.assertEqual(fobj.read(), 'print("hello")\n')
cache = black.read_cache(mode)
with two.open("r") as fobj:
self.assertEqual(fobj.read(), 'print("hello")\n')
cache = black.read_cache(mode)
- self.assertIn(one , cache)
- self.assertIn(two , cache)
+ self.assertIn(str(one) , cache)
+ self.assertIn(str(two) , cache)
def test_no_cache_when_writeback_diff(self) -> None:
mode = DEFAULT_MODE
def test_no_cache_when_writeback_diff(self) -> None:
mode = DEFAULT_MODE
src.touch()
black.write_cache({}, [src], mode)
cache = black.read_cache(mode)
src.touch()
black.write_cache({}, [src], mode)
cache = black.read_cache(mode)
- self.assertIn(src , cache)
- self.assertEqual(cache[src ], black.get_cache_info(src))
+ self.assertIn(str(src) , cache)
+ self.assertEqual(cache[str(src) ], black.get_cache_info(src))
def test_filter_cached(self) -> None:
with TemporaryDirectory() as workspace:
def test_filter_cached(self) -> None:
with TemporaryDirectory() as workspace:
uncached.touch()
cached.touch()
cached_but_changed.touch()
uncached.touch()
cached.touch()
cached_but_changed.touch()
- cache = {cached: black.get_cache_info(cached), cached_but_changed: (0.0, 0)}
+ cache = {
+ str(cached): black.get_cache_info(cached),
+ str(cached_but_changed): (0.0, 0),
+ }
todo, done = black.filter_cached(
cache, {uncached, cached, cached_but_changed}
)
todo, done = black.filter_cached(
cache, {uncached, cached, cached_but_changed}
)
fobj.write('print("hello")\n')
self.invokeBlack([str(workspace)], exit_code=123)
cache = black.read_cache(mode)
fobj.write('print("hello")\n')
self.invokeBlack([str(workspace)], exit_code=123)
cache = black.read_cache(mode)
- self.assertNotIn(failing , cache)
- self.assertIn(clean , cache)
+ self.assertNotIn(str(failing) , cache)
+ self.assertIn(str(clean) , cache)
def test_write_cache_write_fail(self) -> None:
mode = DEFAULT_MODE
def test_write_cache_write_fail(self) -> None:
mode = DEFAULT_MODE
path.touch()
black.write_cache({}, [path], mode)
one = black.read_cache(mode)
path.touch()
black.write_cache({}, [path], mode)
one = black.read_cache(mode)
- self.assertIn(path , one)
+ self.assertIn(str(path) , one)
two = black.read_cache(short_mode)
two = black.read_cache(short_mode)
- self.assertNotIn(path , two)
+ self.assertNotIn(str(path) , two)
def test_single_file_force_pyi(self) -> None:
pyi_mode = replace(DEFAULT_MODE, is_pyi=True)
def test_single_file_force_pyi(self) -> None:
pyi_mode = replace(DEFAULT_MODE, is_pyi=True)
actual = fh.read()
# verify cache with --pyi is separate
pyi_cache = black.read_cache(pyi_mode)
actual = fh.read()
# verify cache with --pyi is separate
pyi_cache = black.read_cache(pyi_mode)
- self.assertIn(path , pyi_cache)
+ self.assertIn(str(path) , pyi_cache)
normal_cache = black.read_cache(DEFAULT_MODE)
normal_cache = black.read_cache(DEFAULT_MODE)
- self.assertNotIn(path , normal_cache)
+ self.assertNotIn(str(path) , normal_cache)
self.assertFormatEqual(expected, actual)
black.assert_equivalent(contents, actual)
black.assert_stable(contents, actual, pyi_mode)
self.assertFormatEqual(expected, actual)
black.assert_equivalent(contents, actual)
black.assert_stable(contents, actual, pyi_mode)
pyi_cache = black.read_cache(pyi_mode)
normal_cache = black.read_cache(reg_mode)
for path in paths:
pyi_cache = black.read_cache(pyi_mode)
normal_cache = black.read_cache(reg_mode)
for path in paths:
- self.assertIn(path , pyi_cache)
- self.assertNotIn(path , normal_cache)
+ self.assertIn(str(path) , pyi_cache)
+ self.assertNotIn(str(path) , normal_cache)
def test_pipe_force_pyi(self) -> None:
source, expected = read_data("force_pyi")
def test_pipe_force_pyi(self) -> None:
source, expected = read_data("force_pyi")
actual = fh.read()
# verify cache with --target-version is separate
py36_cache = black.read_cache(py36_mode)
actual = fh.read()
# verify cache with --target-version is separate
py36_cache = black.read_cache(py36_mode)
- self.assertIn(path , py36_cache)
+ self.assertIn(str(path) , py36_cache)
normal_cache = black.read_cache(reg_mode)
normal_cache = black.read_cache(reg_mode)
- self.assertNotIn(path , normal_cache)
+ self.assertNotIn(str(path) , normal_cache)
self.assertEqual(actual, expected)
@event_loop()
self.assertEqual(actual, expected)
@event_loop()
pyi_cache = black.read_cache(py36_mode)
normal_cache = black.read_cache(reg_mode)
for path in paths:
pyi_cache = black.read_cache(py36_mode)
normal_cache = black.read_cache(reg_mode)
for path in paths:
- self.assertIn(path , pyi_cache)
- self.assertNotIn(path , normal_cache)
+ self.assertIn(str(path) , pyi_cache)
+ self.assertNotIn(str(path) , normal_cache)
def test_pipe_force_py36(self) -> None:
source, expected = read_data("force_py36")
def test_pipe_force_py36(self) -> None:
source, expected = read_data("force_py36")
finally:
os.chdir(str(old_cwd))
finally:
os.chdir(str(old_cwd))
+ def test_newline_comment_interaction(self) -> None:
+ source = "class A:\\\r\n# type: ignore\n pass\n"
+ output = black.format_str(source, mode=DEFAULT_MODE)
+ black.assert_stable(source, output, mode=DEFAULT_MODE)
+
with open(black.__file__, "r", encoding="utf-8") as _bf:
black_source_lines = _bf.readlines()
with open(black.__file__, "r", encoding="utf-8") as _bf:
black_source_lines = _bf.readlines()