actions/black
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Isolate command line tests from user-level config (#2851)

Browse Source
This commit is contained in:
Richard Si 2022-02-01 00:29:01 -05:00 committed by GitHub
parent f3f3acc444
commit fb9fe6b565
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/test_black.py
View File

@ -63,6 +63,7 @@
) )
THIS_FILE = Path(__file__) THIS_FILE = Path(__file__)
EMPTY_CONFIG = THIS_DIR / "data" / "empty_pyproject.toml"
PY36_ARGS = [f"--target-version={version.name.lower()}" for version in PY36_VERSIONS] PY36_ARGS = [f"--target-version={version.name.lower()}" for version in PY36_VERSIONS]
DEFAULT_EXCLUDE = black.re_compile_maybe_verbose(black.const.DEFAULT_EXCLUDES) DEFAULT_EXCLUDE = black.re_compile_maybe_verbose(black.const.DEFAULT_EXCLUDES)
DEFAULT_INCLUDE = black.re_compile_maybe_verbose(black.const.DEFAULT_INCLUDES) DEFAULT_INCLUDE = black.re_compile_maybe_verbose(black.const.DEFAULT_INCLUDES)
@ -159,7 +160,12 @@ def test_piping(self) -> None:
source, expected = read_data("src/black/__init__", data=False) source, expected = read_data("src/black/__init__", data=False)
result = BlackRunner().invoke( result = BlackRunner().invoke(
black.main, black.main,
["-", "--fast", f"--line-length={black.DEFAULT_LINE_LENGTH}"], [
"-",
"--fast",
f"--line-length={black.DEFAULT_LINE_LENGTH}",
f"--config={EMPTY_CONFIG}",
],
input=BytesIO(source.encode("utf8")), input=BytesIO(source.encode("utf8")),
) )
self.assertEqual(result.exit_code, 0) self.assertEqual(result.exit_code, 0)
@ -175,13 +181,12 @@ def test_piping_diff(self) -> None:
) )
source, _ = read_data("expression.py") source, _ = read_data("expression.py")
expected, _ = read_data("expression.diff") expected, _ = read_data("expression.diff")
config = THIS_DIR / "data" / "empty_pyproject.toml"
args = [ args = [
"-", "-",
"--fast", "--fast",
f"--line-length={black.DEFAULT_LINE_LENGTH}", f"--line-length={black.DEFAULT_LINE_LENGTH}",
"--diff", "--diff",
f"--config={config}", f"--config={EMPTY_CONFIG}",
] ]
result = BlackRunner().invoke( result = BlackRunner().invoke(
black.main, args, input=BytesIO(source.encode("utf8")) black.main, args, input=BytesIO(source.encode("utf8"))
@ -193,14 +198,13 @@ def test_piping_diff(self) -> None:
def test_piping_diff_with_color(self) -> None: def test_piping_diff_with_color(self) -> None:
source, _ = read_data("expression.py") source, _ = read_data("expression.py")
config = THIS_DIR / "data" / "empty_pyproject.toml"
args = [ args = [
"-", "-",
"--fast", "--fast",
f"--line-length={black.DEFAULT_LINE_LENGTH}", f"--line-length={black.DEFAULT_LINE_LENGTH}",
"--diff", "--diff",
"--color", "--color",
f"--config={config}", f"--config={EMPTY_CONFIG}",
] ]
result = BlackRunner().invoke( result = BlackRunner().invoke(
black.main, args, input=BytesIO(source.encode("utf8")) black.main, args, input=BytesIO(source.encode("utf8"))
@ -252,7 +256,6 @@ def test_expression_ff(self) -> None:
def test_expression_diff(self) -> None: def test_expression_diff(self) -> None:
source, _ = read_data("expression.py") source, _ = read_data("expression.py")
config = THIS_DIR / "data" / "empty_pyproject.toml"
expected, _ = read_data("expression.diff") expected, _ = read_data("expression.diff")
tmp_file = Path(black.dump_to_file(source)) tmp_file = Path(black.dump_to_file(source))
diff_header = re.compile( diff_header = re.compile(
@ -261,7 +264,7 @@ def test_expression_diff(self) -> None:
) )
try: try:
result = BlackRunner().invoke( result = BlackRunner().invoke(
black.main, ["--diff", str(tmp_file), f"--config={config}"] black.main, ["--diff", str(tmp_file), f"--config={EMPTY_CONFIG}"]
) )
self.assertEqual(result.exit_code, 0) self.assertEqual(result.exit_code, 0)
finally: finally:
@ -279,12 +282,12 @@ def test_expression_diff(self) -> None:
def test_expression_diff_with_color(self) -> None: def test_expression_diff_with_color(self) -> None:
source, _ = read_data("expression.py") source, _ = read_data("expression.py")
config = THIS_DIR / "data" / "empty_pyproject.toml"
expected, _ = read_data("expression.diff") expected, _ = read_data("expression.diff")
tmp_file = Path(black.dump_to_file(source)) tmp_file = Path(black.dump_to_file(source))
try: try:
result = BlackRunner().invoke( result = BlackRunner().invoke(
black.main, ["--diff", "--color", str(tmp_file), f"--config={config}"] black.main,
["--diff", "--color", str(tmp_file), f"--config={EMPTY_CONFIG}"],
) )
finally: finally:
os.unlink(tmp_file) os.unlink(tmp_file)
@ -325,7 +328,9 @@ def test_skip_magic_trailing_comma(self) -> None:
r"\d\d:\d\d:\d\d\.\d\d\d\d\d\d \+\d\d\d\d" r"\d\d:\d\d:\d\d\.\d\d\d\d\d\d \+\d\d\d\d"
) )
try: try:
result = BlackRunner().invoke(black.main, ["-C", "--diff", str(tmp_file)]) result = BlackRunner().invoke(
black.main, ["-C", "--diff", str(tmp_file), f"--config={EMPTY_CONFIG}"]
)
self.assertEqual(result.exit_code, 0) self.assertEqual(result.exit_code, 0)
finally: finally:
os.unlink(tmp_file) os.unlink(tmp_file)