Skip to content

Commit

Permalink
Fix Pytest's deprecation warnings about nose usage (#8758)
Browse files Browse the repository at this point in the history
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: #8757
Signed-off-by: Stanislav Levin <slev@altlinux.org>

Signed-off-by: Stanislav Levin <slev@altlinux.org>
  • Loading branch information
stanislavlevin committed Nov 15, 2022
1 parent ae7a2b0 commit 78cdae6
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 32 deletions.
14 changes: 7 additions & 7 deletions tests/test_fields.py
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -313,7 +313,7 @@ def test_initial(self):


class TestInitialWithCallable:
def setup(self):
def setup_method(self):
def initial_value():
return 123

Expand All @@ -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()
Expand All @@ -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')
Expand Down Expand Up @@ -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):
Expand Down
12 changes: 6 additions & 6 deletions tests/test_pagination.py
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/test_relations.py
Expand Up @@ -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):
Expand Down
14 changes: 7 additions & 7 deletions tests/test_serializer.py
Expand Up @@ -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()
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions tests/test_serializer_lists.py
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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()

Expand Down Expand Up @@ -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()

Expand Down
10 changes: 5 additions & 5 deletions tests/test_serializer_nested.py
Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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])

Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 78cdae6

Please sign in to comment.