# HG changeset patch # User Ludovic Chabant # Date 1623821691 25200 # Node ID 161cba5d031abaad28868d49156ab300f3083288 # Parent 2ead9dcb6bec49720654f8add9f7112f90c7f801 tests: pytest deprecated API diff -r 2ead9dcb6bec -r 161cba5d031a tests/conftest.py --- a/tests/conftest.py Fri Oct 23 23:50:42 2020 -0700 +++ b/tests/conftest.py Tue Jun 15 22:34:51 2021 -0700 @@ -62,11 +62,11 @@ if path.ext == '.yaml' and path.basename.startswith("test"): category = os.path.basename(path.dirname) if category == 'bakes': - return BakeTestFile(path, parent) + return BakeTestFile.from_parent(parent, fspath=path) elif category == 'cli': - return ChefTestFile(path, parent) + return ChefTestFile.from_parent(parent, fspath=path) elif category == 'servings': - return ServeTestFile(path, parent) + return ServeTestFile.from_parent(parent, fspath=path) def repr_nested_failure(excinfo): @@ -89,7 +89,7 @@ name = '%s_%d' % (self.fspath.basename, i) if 'test_name' in item: name += '_%s' % item['test_name'] - yield self.__item_class__(name, self, item) + yield self.__item_class__.from_parent(self, name=name, spec=item) class YamlTestItemBase(pytest.Item):