Skip to content

Commit

Permalink
re-run black
Browse files Browse the repository at this point in the history
  • Loading branch information
blueyed committed Nov 16, 2019
1 parent 3d8649b commit 097acaf
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/_pytest/python_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ def raises(expected_exception, *args, **kwargs):
return RaisesContext(expected_exception, message, match_expr)
elif isinstance(args[0], str):
warnings.warn(deprecated.RAISES_EXEC, stacklevel=2)
code, = args
(code,) = args
assert isinstance(code, str)
frame = sys._getframe(1)
loc = frame.f_locals.copy()
Expand Down
2 changes: 1 addition & 1 deletion src/_pytest/recwarn.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def warns(expected_warning, *args, **kwargs):
return WarningsChecker(expected_warning, match_expr=match_expr)
elif isinstance(args[0], str):
warnings.warn(WARNS_EXEC, stacklevel=2)
code, = args
(code,) = args
assert isinstance(code, str)
frame = sys._getframe(1)
loc = frame.f_locals.copy()
Expand Down
4 changes: 2 additions & 2 deletions testing/deprecated_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def test_pytest_plugins_in_non_top_level_conftest_unsupported_pyargs(


def test_pytest_plugins_in_non_top_level_conftest_unsupported_no_top_level_conftest(
testdir
testdir,
):
from _pytest.deprecated import PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST

Expand Down Expand Up @@ -181,7 +181,7 @@ def test_func():


def test_pytest_plugins_in_non_top_level_conftest_unsupported_no_false_positives(
testdir
testdir,
):
from _pytest.deprecated import PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST

Expand Down
6 changes: 3 additions & 3 deletions testing/python/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ def test_func(something): pass
assert repr(req).find(req.function.__name__) != -1

def test_request_attributes_method(self, testdir):
item, = testdir.getitems(
(item,) = testdir.getitems(
"""
import pytest
class TestB(object):
Expand Down Expand Up @@ -492,7 +492,7 @@ def test_method(self, something):
pass
"""
)
item1, = testdir.genitems([modcol])
(item1,) = testdir.genitems([modcol])
assert item1.name == "test_method"
arg2fixturedefs = fixtures.FixtureRequest(item1)._arg2fixturedefs
assert len(arg2fixturedefs) == 1
Expand Down Expand Up @@ -756,7 +756,7 @@ def test_second():

def test_request_getmodulepath(self, testdir):
modcol = testdir.getmodulecol("def test_somefunc(): pass")
item, = testdir.genitems([modcol])
(item,) = testdir.genitems([modcol])
req = fixtures.FixtureRequest(item)
assert req.fspath == modcol.fspath

Expand Down
8 changes: 4 additions & 4 deletions testing/test_collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ def test_collect_protocol_single_function(self, testdir):
p = testdir.makepyfile("def test_func(): pass")
id = "::".join([p.basename, "test_func"])
items, hookrec = testdir.inline_genitems(id)
item, = items
(item,) = items
assert item.name == "test_func"
newid = item.nodeid
assert newid == id
Expand Down Expand Up @@ -613,9 +613,9 @@ def test_serialization_byid(self, testdir):
testdir.makepyfile("def test_func(): pass")
items, hookrec = testdir.inline_genitems()
assert len(items) == 1
item, = items
(item,) = items
items2, hookrec = testdir.inline_genitems(item.nodeid)
item2, = items2
(item2,) = items2
assert item2.name == item.name
assert item2.fspath == item.fspath

Expand All @@ -630,7 +630,7 @@ def test_method(self):
arg = p.basename + "::TestClass::test_method"
items, hookrec = testdir.inline_genitems(arg)
assert len(items) == 1
item, = items
(item,) = items
assert item.nodeid.endswith("TestClass::test_method")
# ensure we are reporting the collection of the single test item (#2464)
assert [x.name for x in self.get_reported_items(hookrec)] == ["test_method"]
Expand Down
4 changes: 2 additions & 2 deletions testing/test_mark.py
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@ def test_custom_mark_parametrized(obj_type):
def test_pytest_param_id_requires_string():
with pytest.raises(TypeError) as excinfo:
pytest.param(id=True)
msg, = excinfo.value.args
(msg,) = excinfo.value.args
if six.PY2:
assert msg == "Expected id to be a string, got <type 'bool'>: True"
else:
Expand All @@ -1025,7 +1025,7 @@ def test_pytest_param_warning_on_unknown_kwargs():
# typo, should be marks=
pytest.param(1, 2, mark=pytest.mark.xfail())
assert warninfo[0].filename == __file__
msg, = warninfo[0].message.args
(msg,) = warninfo[0].message.args
assert msg == (
"pytest.param() got unexpected keyword arguments: ['mark'].\n"
"This will be an error in future versions."
Expand Down
2 changes: 1 addition & 1 deletion testing/test_recwarn.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def test_strings(self):
assert len(warninfo) == 3
for w in warninfo:
assert w.filename == __file__
msg, = w.message.args
(msg,) = w.message.args
assert msg.startswith("warns(..., 'code(as_a_string)') is deprecated")

def test_function(self):
Expand Down
2 changes: 1 addition & 1 deletion testing/test_skipping.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def test_func():
)

def test_skipif_class(self, testdir):
item, = testdir.getitems(
(item,) = testdir.getitems(
"""
import pytest
class TestClass(object):
Expand Down
2 changes: 1 addition & 1 deletion testing/test_tmpdir.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ def test_lock_register_cleanup_removal(self, tmp_path):
registry = []
register_cleanup_lock_removal(lock, register=registry.append)

cleanup_func, = registry
(cleanup_func,) = registry

assert lock.is_file()

Expand Down
2 changes: 1 addition & 1 deletion testing/test_unittest.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ def test_hello(self):


def test_testcase_totally_incompatible_exception_info(testdir):
item, = testdir.getitems(
(item,) = testdir.getitems(
"""
from unittest import TestCase
class MyTestCase(TestCase):
Expand Down

0 comments on commit 097acaf

Please sign in to comment.