From 78cdae69997c9fd95211ec15fb4e21f4cd45e30a Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Tue, 15 Nov 2022 15:29:15 +0300 Subject: [PATCH] Fix Pytest's deprecation warnings about nose usage (#8758) Pytest 7.2.0 deprecated plain `setup` and `teardown` functions and methods as nose idioms: https://docs.pytest.org/en/latest/changelog.html#pytest-7-2-0-2022-10-23 `setup` can be safely replaced with `setup_method`: https://docs.pytest.org/en/stable/deprecations.html#setup-teardown Fixes: https://github.com/encode/django-rest-framework/issues/8757 Signed-off-by: Stanislav Levin Signed-off-by: Stanislav Levin --- tests/test_fields.py | 14 +++++++------- tests/test_pagination.py | 12 ++++++------ tests/test_relations.py | 2 +- tests/test_serializer.py | 14 +++++++------- tests/test_serializer_lists.py | 12 ++++++------ tests/test_serializer_nested.py | 10 +++++----- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/tests/test_fields.py b/tests/test_fields.py index 11e293107d..72ef23dca5 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -239,7 +239,7 @@ class BuiltinSerializer(serializers.Serializer): class TestReadOnly: - def setup(self): + def setup_method(self): class TestSerializer(serializers.Serializer): read_only = serializers.ReadOnlyField(default="789") writable = serializers.IntegerField() @@ -271,7 +271,7 @@ def test_serialize_read_only(self): class TestWriteOnly: - def setup(self): + def setup_method(self): class TestSerializer(serializers.Serializer): write_only = serializers.IntegerField(write_only=True) readable = serializers.IntegerField() @@ -296,7 +296,7 @@ def test_serialize_write_only(self): class TestInitial: - def setup(self): + def setup_method(self): class TestSerializer(serializers.Serializer): initial_field = serializers.IntegerField(initial=123) blank_field = serializers.IntegerField() @@ -313,7 +313,7 @@ def test_initial(self): class TestInitialWithCallable: - def setup(self): + def setup_method(self): def initial_value(): return 123 @@ -331,7 +331,7 @@ def test_initial_should_accept_callable(self): class TestLabel: - def setup(self): + def setup_method(self): class TestSerializer(serializers.Serializer): labeled = serializers.IntegerField(label='My label') self.serializer = TestSerializer() @@ -345,7 +345,7 @@ def test_label(self): class TestInvalidErrorKey: - def setup(self): + def setup_method(self): class ExampleField(serializers.Field): def to_native(self, data): self.fail('incorrect') @@ -539,7 +539,7 @@ class TestSerializer(serializers.Serializer): class TestCreateOnlyDefault: - def setup(self): + def setup_method(self): default = serializers.CreateOnlyDefault('2001-01-01') class TestSerializer(serializers.Serializer): diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 5d7864700d..74a65bf506 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -18,7 +18,7 @@ class TestPaginationIntegration: Integration tests. """ - def setup(self): + def setup_method(self): class PassThroughSerializer(serializers.BaseSerializer): def to_representation(self, item): return item @@ -140,7 +140,7 @@ class TestPaginationDisabledIntegration: Integration tests for disabled pagination. """ - def setup(self): + def setup_method(self): class PassThroughSerializer(serializers.BaseSerializer): def to_representation(self, item): return item @@ -163,7 +163,7 @@ class TestPageNumberPagination: Unit tests for `pagination.PageNumberPagination`. """ - def setup(self): + def setup_method(self): class ExamplePagination(pagination.PageNumberPagination): page_size = 5 @@ -302,7 +302,7 @@ class TestPageNumberPaginationOverride: the Django Paginator Class is overridden. """ - def setup(self): + def setup_method(self): class OverriddenDjangoPaginator(DjangoPaginator): # override the count in our overridden Django Paginator # we will only return one page, with one item @@ -358,7 +358,7 @@ class TestLimitOffset: Unit tests for `pagination.LimitOffsetPagination`. """ - def setup(self): + def setup_method(self): class ExamplePagination(pagination.LimitOffsetPagination): default_limit = 10 max_limit = 15 @@ -941,7 +941,7 @@ class TestCursorPagination(CursorPaginationTestsMixin): Unit tests for `pagination.CursorPagination`. """ - def setup(self): + def setup_method(self): class MockObject: def __init__(self, idx): self.created = idx diff --git a/tests/test_relations.py b/tests/test_relations.py index bb719a65a9..7a4db1c487 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -374,7 +374,7 @@ def test_get_value_multi_dictionary_partial(self): class TestHyperlink: - def setup(self): + def setup_method(self): self.default_hyperlink = serializers.Hyperlink('http://example.com', 'test') def test_can_be_pickled(self): diff --git a/tests/test_serializer.py b/tests/test_serializer.py index c4c29ba4ad..1d9efaa434 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -61,7 +61,7 @@ def test_relations(self): # ----------------------------- class TestSerializer: - def setup(self): + def setup_method(self): class ExampleSerializer(serializers.Serializer): char = serializers.CharField() integer = serializers.IntegerField() @@ -240,7 +240,7 @@ def validate(self, attrs): class TestBaseSerializer: - def setup(self): + def setup_method(self): class ExampleSerializer(serializers.BaseSerializer): def to_representation(self, obj): return { @@ -337,7 +337,7 @@ class TestStarredSource: 'nested2': {'c': 3, 'd': 4} } - def setup(self): + def setup_method(self): class NestedSerializer1(serializers.Serializer): a = serializers.IntegerField() b = serializers.IntegerField() @@ -463,7 +463,7 @@ def create(self, validated_data): class TestDefaultOutput: - def setup(self): + def setup_method(self): class ExampleSerializer(serializers.Serializer): has_default = serializers.CharField(default='x') has_default_callable = serializers.CharField(default=lambda: 'y') @@ -584,7 +584,7 @@ class ExampleSerializer(serializers.Serializer): class TestDefaultInclusions: - def setup(self): + def setup_method(self): class ExampleSerializer(serializers.Serializer): char = serializers.CharField(default='abc') integer = serializers.IntegerField() @@ -612,7 +612,7 @@ def test_default_should_not_be_included_on_partial_update(self): class TestSerializerValidationWithCompiledRegexField: - def setup(self): + def setup_method(self): class ExampleSerializer(serializers.Serializer): name = serializers.RegexField(re.compile(r'\d'), required=True) self.Serializer = ExampleSerializer @@ -641,7 +641,7 @@ class ParentSerializer(serializers.Serializer): class Test4606Regression: - def setup(self): + def setup_method(self): class ExampleSerializer(serializers.Serializer): name = serializers.CharField(required=True) choices = serializers.CharField(required=True) diff --git a/tests/test_serializer_lists.py b/tests/test_serializer_lists.py index 551f626662..4b60643a85 100644 --- a/tests/test_serializer_lists.py +++ b/tests/test_serializer_lists.py @@ -32,7 +32,7 @@ class TestListSerializer: Note that this is in contrast to using ListSerializer as a field. """ - def setup(self): + def setup_method(self): class IntegerListSerializer(serializers.ListSerializer): child = serializers.IntegerField() self.Serializer = IntegerListSerializer @@ -70,7 +70,7 @@ class TestListSerializerContainingNestedSerializer: Tests for using a ListSerializer containing another serializer. """ - def setup(self): + def setup_method(self): class TestSerializer(serializers.Serializer): integer = serializers.IntegerField() boolean = serializers.BooleanField() @@ -156,7 +156,7 @@ class TestNestedListSerializer: Tests for using a ListSerializer as a field. """ - def setup(self): + def setup_method(self): class TestSerializer(serializers.Serializer): integers = serializers.ListSerializer(child=serializers.IntegerField()) booleans = serializers.ListSerializer(child=serializers.BooleanField()) @@ -278,7 +278,7 @@ class ParentSerializer(serializers.Serializer): class TestNestedListOfListsSerializer: - def setup(self): + def setup_method(self): class TestSerializer(serializers.Serializer): integers = serializers.ListSerializer( child=serializers.ListSerializer( @@ -594,7 +594,7 @@ class TestEmptyListSerializer: Tests the behaviour of ListSerializers when there is no data passed to it """ - def setup(self): + def setup_method(self): class ExampleListSerializer(serializers.ListSerializer): child = serializers.IntegerField() @@ -623,7 +623,7 @@ class TestMaxMinLengthListSerializer: Tests the behaviour of ListSerializers when max_length and min_length are used """ - def setup(self): + def setup_method(self): class IntegerSerializer(serializers.Serializer): some_int = serializers.IntegerField() diff --git a/tests/test_serializer_nested.py b/tests/test_serializer_nested.py index 09ac37f246..986972a65a 100644 --- a/tests/test_serializer_nested.py +++ b/tests/test_serializer_nested.py @@ -9,7 +9,7 @@ class TestNestedSerializer: - def setup(self): + def setup_method(self): class NestedSerializer(serializers.Serializer): one = serializers.IntegerField(max_value=10) two = serializers.IntegerField(max_value=10) @@ -54,7 +54,7 @@ def test_nested_serialize_no_data(self): class TestNotRequiredNestedSerializer: - def setup(self): + def setup_method(self): class NestedSerializer(serializers.Serializer): one = serializers.IntegerField(max_value=10) @@ -83,7 +83,7 @@ def test_multipart_validate(self): class TestNestedSerializerWithMany: - def setup(self): + def setup_method(self): class NestedSerializer(serializers.Serializer): example = serializers.IntegerField(max_value=10) @@ -181,7 +181,7 @@ def test_empty_not_allowed_if_allow_empty_is_set_to_false(self): class TestNestedSerializerWithList: - def setup(self): + def setup_method(self): class NestedSerializer(serializers.Serializer): example = serializers.MultipleChoiceField(choices=[1, 2, 3]) @@ -210,7 +210,7 @@ def test_nested_serializer_with_list_multipart(self): class TestNotRequiredNestedSerializerWithMany: - def setup(self): + def setup_method(self): class NestedSerializer(serializers.Serializer): one = serializers.IntegerField(max_value=10)