Skip to content

Commit

Permalink
pre-commit run --all-files
Browse files Browse the repository at this point in the history
  • Loading branch information
blueyed committed Mar 7, 2020
1 parent 673ed96 commit 1ca9e18
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/_pytest/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -1141,7 +1141,7 @@ def fixture(
params=params,
autouse=autouse,
ids=ids,
name=name
name=name,
)
scope = arguments.get("scope")
params = arguments.get("params")
Expand Down Expand Up @@ -1179,7 +1179,7 @@ def yield_fixture(
params=params,
autouse=autouse,
ids=ids,
name=name
name=name,
)


Expand Down
2 changes: 1 addition & 1 deletion testing/test_capture.py
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ def test_hello(capsys):
out, err = capsys.readouterr()
assert out.startswith("42")
""",
*opt
*opt,
)
reprec.assertoutcome(passed=1)

Expand Down
4 changes: 2 additions & 2 deletions testing/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ def pytest_sessionstart(session):
config = session.config
terminal_plugin.append(bool(config.pluginmanager.get_plugin("terminalreporter")))
"""
}
},
)
testdir.syspathinsert()
result = testdir.runpytest("-p", "myplugin", str(p1))
Expand Down Expand Up @@ -812,7 +812,7 @@ def pytest_addoption(parser):

testdir.makefile(
".ini",
**{"pytest": "[pytest]\nfoo = root", "subdir/pytest": "[pytest]\nfoo = subdir"}
**{"pytest": "[pytest]\nfoo = root", "subdir/pytest": "[pytest]\nfoo = subdir"},
)

testdir.makepyfile(
Expand Down

0 comments on commit 1ca9e18

Please sign in to comment.