summaryrefslogtreecommitdiff
path: root/testing/acceptance_test.py
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2020-07-22 21:36:51 -0300
committerGitHub <noreply@github.com>2020-07-22 21:36:51 -0300
commit7ec6401ffabf79d52938ece5b8ff566a8b9c260e (patch)
tree6b34b476b5249750c8dd893b99f64eedf8345621 /testing/acceptance_test.py
parenta9799f0b35fe8fcc88ebd19b007cd2c6ac6b2a4f (diff)
downloadpytest-7ec6401ffabf79d52938ece5b8ff566a8b9c260e.tar.gz
Change pytest deprecation warnings into errors for 6.0 release (#7362)
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
Diffstat (limited to 'testing/acceptance_test.py')
-rw-r--r--testing/acceptance_test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
index e558c7f67..2a386e2c6 100644
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -302,10 +302,10 @@ class TestGeneralUsage:
pass
class MyCollector(pytest.File):
def collect(self):
- return [MyItem(name="xyz", parent=self)]
+ return [MyItem.from_parent(name="xyz", parent=self)]
def pytest_collect_file(path, parent):
if path.basename.startswith("conftest"):
- return MyCollector(path, parent)
+ return MyCollector.from_parent(fspath=path, parent=parent)
"""
)
result = testdir.runpytest(c.basename + "::" + "xyz")