Upgrade pre-commit hooks except pyupgrade

This commit is contained in:
Anthony Sottile
2018-06-26 06:35:27 -07:00
parent 8133d1955e
commit cbaa7dd56a
86 changed files with 309 additions and 631 deletions

View File

@@ -8,7 +8,6 @@ from _pytest import fixtures
def test_getfuncargnames():
def f():
pass
@@ -30,7 +29,6 @@ def test_getfuncargnames():
assert fixtures.getfuncargnames(h) == ("arg1", "arg2")
class A(object):
def f(self, arg1, arg2="hello"):
pass
@@ -43,7 +41,6 @@ def test_getfuncargnames():
class TestFillFixtures(object):
def test_fillfuncargs_exposed(self):
# used by oejskit, kept for compatibility
assert pytest._fillfuncargs == fixtures.fillfixtures
@@ -570,7 +567,6 @@ class TestFillFixtures(object):
class TestRequestBasic(object):
def test_request_attributes(self, testdir):
item = testdir.getitem(
"""
@@ -1003,7 +999,6 @@ class TestRequestBasic(object):
class TestRequestMarking(object):
def test_applymarker(self, testdir):
item1, item2 = testdir.getitems(
"""
@@ -1073,7 +1068,6 @@ class TestRequestMarking(object):
class TestRequestCachedSetup(object):
def test_request_cachedsetup_defaultmodule(self, testdir):
reprec = testdir.inline_runsource(
"""
@@ -1245,7 +1239,6 @@ class TestRequestCachedSetup(object):
class TestFixtureUsages(object):
def test_noargfixturedec(self, testdir):
testdir.makepyfile(
"""
@@ -1540,7 +1533,6 @@ class TestFixtureUsages(object):
class TestFixtureManagerParseFactories(object):
@pytest.fixture
def testdir(self, request):
testdir = request.getfixturevalue("testdir")
@@ -1668,7 +1660,6 @@ class TestFixtureManagerParseFactories(object):
class TestAutouseDiscovery(object):
@pytest.fixture
def testdir(self, testdir):
testdir.makeconftest(
@@ -1845,7 +1836,6 @@ class TestAutouseDiscovery(object):
class TestAutouseManagement(object):
def test_autouse_conftest_mid_directory(self, testdir):
pkgdir = testdir.mkpydir("xyz123")
pkgdir.join("conftest.py").write(
@@ -2112,7 +2102,6 @@ class TestAutouseManagement(object):
class TestFixtureMarker(object):
def test_parametrize(self, testdir):
testdir.makepyfile(
"""
@@ -2938,21 +2927,18 @@ class TestFixtureMarker(object):
reprec = testdir.inline_run()
reprec.assertoutcome(passed=6)
values = reprec.getcalls("pytest_runtest_call")[0].item.module.values
assert (
values
== [
"test_hello",
"fin John",
"test_hello",
"fin Doe",
"test_name",
"test_population",
"fin John",
"test_name",
"test_population",
"fin Doe",
]
)
assert values == [
"test_hello",
"fin John",
"test_hello",
"fin Doe",
"test_name",
"test_population",
"fin John",
"test_name",
"test_population",
"fin Doe",
]
def test_parametrize_setup_function(self, testdir):
testdir.makepyfile(
@@ -3135,7 +3121,6 @@ class TestRequestScopeAccess(object):
class TestErrors(object):
def test_subfactory_missing_funcarg(self, testdir):
testdir.makepyfile(
"""
@@ -3203,7 +3188,6 @@ class TestErrors(object):
class TestShowFixtures(object):
def test_funcarg_compat(self, testdir):
config = testdir.parseconfigure("--funcargs")
assert config.option.showfixtures
@@ -3480,7 +3464,6 @@ class TestShowFixtures(object):
@pytest.mark.parametrize("flavor", ["fixture", "yield_fixture"])
class TestContextManagerFixtureFuncs(object):
def test_simple(self, testdir, flavor):
testdir.makepyfile(
"""
@@ -3622,7 +3605,6 @@ class TestContextManagerFixtureFuncs(object):
class TestParameterizedSubRequest(object):
def test_call_from_fixture(self, testdir):
testfile = testdir.makepyfile(
"""