Skip to content

Commit 78cdae6

Browse files
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: #8757 Signed-off-by: Stanislav Levin <slev@altlinux.org> Signed-off-by: Stanislav Levin <slev@altlinux.org>
1 parent ae7a2b0 commit 78cdae6

6 files changed

+32
-32
lines changed

tests/test_fields.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ class BuiltinSerializer(serializers.Serializer):
239239

240240

241241
class TestReadOnly:
242-
def setup(self):
242+
def setup_method(self):
243243
class TestSerializer(serializers.Serializer):
244244
read_only = serializers.ReadOnlyField(default="789")
245245
writable = serializers.IntegerField()
@@ -271,7 +271,7 @@ def test_serialize_read_only(self):
271271

272272

273273
class TestWriteOnly:
274-
def setup(self):
274+
def setup_method(self):
275275
class TestSerializer(serializers.Serializer):
276276
write_only = serializers.IntegerField(write_only=True)
277277
readable = serializers.IntegerField()
@@ -296,7 +296,7 @@ def test_serialize_write_only(self):
296296

297297

298298
class TestInitial:
299-
def setup(self):
299+
def setup_method(self):
300300
class TestSerializer(serializers.Serializer):
301301
initial_field = serializers.IntegerField(initial=123)
302302
blank_field = serializers.IntegerField()
@@ -313,7 +313,7 @@ def test_initial(self):
313313

314314

315315
class TestInitialWithCallable:
316-
def setup(self):
316+
def setup_method(self):
317317
def initial_value():
318318
return 123
319319

@@ -331,7 +331,7 @@ def test_initial_should_accept_callable(self):
331331

332332

333333
class TestLabel:
334-
def setup(self):
334+
def setup_method(self):
335335
class TestSerializer(serializers.Serializer):
336336
labeled = serializers.IntegerField(label='My label')
337337
self.serializer = TestSerializer()
@@ -345,7 +345,7 @@ def test_label(self):
345345

346346

347347
class TestInvalidErrorKey:
348-
def setup(self):
348+
def setup_method(self):
349349
class ExampleField(serializers.Field):
350350
def to_native(self, data):
351351
self.fail('incorrect')
@@ -539,7 +539,7 @@ class TestSerializer(serializers.Serializer):
539539

540540

541541
class TestCreateOnlyDefault:
542-
def setup(self):
542+
def setup_method(self):
543543
default = serializers.CreateOnlyDefault('2001-01-01')
544544

545545
class TestSerializer(serializers.Serializer):

tests/test_pagination.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class TestPaginationIntegration:
1818
Integration tests.
1919
"""
2020

21-
def setup(self):
21+
def setup_method(self):
2222
class PassThroughSerializer(serializers.BaseSerializer):
2323
def to_representation(self, item):
2424
return item
@@ -140,7 +140,7 @@ class TestPaginationDisabledIntegration:
140140
Integration tests for disabled pagination.
141141
"""
142142

143-
def setup(self):
143+
def setup_method(self):
144144
class PassThroughSerializer(serializers.BaseSerializer):
145145
def to_representation(self, item):
146146
return item
@@ -163,7 +163,7 @@ class TestPageNumberPagination:
163163
Unit tests for `pagination.PageNumberPagination`.
164164
"""
165165

166-
def setup(self):
166+
def setup_method(self):
167167
class ExamplePagination(pagination.PageNumberPagination):
168168
page_size = 5
169169

@@ -302,7 +302,7 @@ class TestPageNumberPaginationOverride:
302302
the Django Paginator Class is overridden.
303303
"""
304304

305-
def setup(self):
305+
def setup_method(self):
306306
class OverriddenDjangoPaginator(DjangoPaginator):
307307
# override the count in our overridden Django Paginator
308308
# we will only return one page, with one item
@@ -358,7 +358,7 @@ class TestLimitOffset:
358358
Unit tests for `pagination.LimitOffsetPagination`.
359359
"""
360360

361-
def setup(self):
361+
def setup_method(self):
362362
class ExamplePagination(pagination.LimitOffsetPagination):
363363
default_limit = 10
364364
max_limit = 15
@@ -941,7 +941,7 @@ class TestCursorPagination(CursorPaginationTestsMixin):
941941
Unit tests for `pagination.CursorPagination`.
942942
"""
943943

944-
def setup(self):
944+
def setup_method(self):
945945
class MockObject:
946946
def __init__(self, idx):
947947
self.created = idx

tests/test_relations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ def test_get_value_multi_dictionary_partial(self):
374374

375375

376376
class TestHyperlink:
377-
def setup(self):
377+
def setup_method(self):
378378
self.default_hyperlink = serializers.Hyperlink('http://example.com', 'test')
379379

380380
def test_can_be_pickled(self):

tests/test_serializer.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def test_relations(self):
6161
# -----------------------------
6262

6363
class TestSerializer:
64-
def setup(self):
64+
def setup_method(self):
6565
class ExampleSerializer(serializers.Serializer):
6666
char = serializers.CharField()
6767
integer = serializers.IntegerField()
@@ -240,7 +240,7 @@ def validate(self, attrs):
240240

241241

242242
class TestBaseSerializer:
243-
def setup(self):
243+
def setup_method(self):
244244
class ExampleSerializer(serializers.BaseSerializer):
245245
def to_representation(self, obj):
246246
return {
@@ -337,7 +337,7 @@ class TestStarredSource:
337337
'nested2': {'c': 3, 'd': 4}
338338
}
339339

340-
def setup(self):
340+
def setup_method(self):
341341
class NestedSerializer1(serializers.Serializer):
342342
a = serializers.IntegerField()
343343
b = serializers.IntegerField()
@@ -463,7 +463,7 @@ def create(self, validated_data):
463463

464464

465465
class TestDefaultOutput:
466-
def setup(self):
466+
def setup_method(self):
467467
class ExampleSerializer(serializers.Serializer):
468468
has_default = serializers.CharField(default='x')
469469
has_default_callable = serializers.CharField(default=lambda: 'y')
@@ -584,7 +584,7 @@ class ExampleSerializer(serializers.Serializer):
584584

585585

586586
class TestDefaultInclusions:
587-
def setup(self):
587+
def setup_method(self):
588588
class ExampleSerializer(serializers.Serializer):
589589
char = serializers.CharField(default='abc')
590590
integer = serializers.IntegerField()
@@ -612,7 +612,7 @@ def test_default_should_not_be_included_on_partial_update(self):
612612

613613

614614
class TestSerializerValidationWithCompiledRegexField:
615-
def setup(self):
615+
def setup_method(self):
616616
class ExampleSerializer(serializers.Serializer):
617617
name = serializers.RegexField(re.compile(r'\d'), required=True)
618618
self.Serializer = ExampleSerializer
@@ -641,7 +641,7 @@ class ParentSerializer(serializers.Serializer):
641641

642642

643643
class Test4606Regression:
644-
def setup(self):
644+
def setup_method(self):
645645
class ExampleSerializer(serializers.Serializer):
646646
name = serializers.CharField(required=True)
647647
choices = serializers.CharField(required=True)

tests/test_serializer_lists.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class TestListSerializer:
3232
Note that this is in contrast to using ListSerializer as a field.
3333
"""
3434

35-
def setup(self):
35+
def setup_method(self):
3636
class IntegerListSerializer(serializers.ListSerializer):
3737
child = serializers.IntegerField()
3838
self.Serializer = IntegerListSerializer
@@ -70,7 +70,7 @@ class TestListSerializerContainingNestedSerializer:
7070
Tests for using a ListSerializer containing another serializer.
7171
"""
7272

73-
def setup(self):
73+
def setup_method(self):
7474
class TestSerializer(serializers.Serializer):
7575
integer = serializers.IntegerField()
7676
boolean = serializers.BooleanField()
@@ -156,7 +156,7 @@ class TestNestedListSerializer:
156156
Tests for using a ListSerializer as a field.
157157
"""
158158

159-
def setup(self):
159+
def setup_method(self):
160160
class TestSerializer(serializers.Serializer):
161161
integers = serializers.ListSerializer(child=serializers.IntegerField())
162162
booleans = serializers.ListSerializer(child=serializers.BooleanField())
@@ -278,7 +278,7 @@ class ParentSerializer(serializers.Serializer):
278278

279279

280280
class TestNestedListOfListsSerializer:
281-
def setup(self):
281+
def setup_method(self):
282282
class TestSerializer(serializers.Serializer):
283283
integers = serializers.ListSerializer(
284284
child=serializers.ListSerializer(
@@ -594,7 +594,7 @@ class TestEmptyListSerializer:
594594
Tests the behaviour of ListSerializers when there is no data passed to it
595595
"""
596596

597-
def setup(self):
597+
def setup_method(self):
598598
class ExampleListSerializer(serializers.ListSerializer):
599599
child = serializers.IntegerField()
600600

@@ -623,7 +623,7 @@ class TestMaxMinLengthListSerializer:
623623
Tests the behaviour of ListSerializers when max_length and min_length are used
624624
"""
625625

626-
def setup(self):
626+
def setup_method(self):
627627
class IntegerSerializer(serializers.Serializer):
628628
some_int = serializers.IntegerField()
629629

tests/test_serializer_nested.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
class TestNestedSerializer:
12-
def setup(self):
12+
def setup_method(self):
1313
class NestedSerializer(serializers.Serializer):
1414
one = serializers.IntegerField(max_value=10)
1515
two = serializers.IntegerField(max_value=10)
@@ -54,7 +54,7 @@ def test_nested_serialize_no_data(self):
5454

5555

5656
class TestNotRequiredNestedSerializer:
57-
def setup(self):
57+
def setup_method(self):
5858
class NestedSerializer(serializers.Serializer):
5959
one = serializers.IntegerField(max_value=10)
6060

@@ -83,7 +83,7 @@ def test_multipart_validate(self):
8383

8484

8585
class TestNestedSerializerWithMany:
86-
def setup(self):
86+
def setup_method(self):
8787
class NestedSerializer(serializers.Serializer):
8888
example = serializers.IntegerField(max_value=10)
8989

@@ -181,7 +181,7 @@ def test_empty_not_allowed_if_allow_empty_is_set_to_false(self):
181181

182182

183183
class TestNestedSerializerWithList:
184-
def setup(self):
184+
def setup_method(self):
185185
class NestedSerializer(serializers.Serializer):
186186
example = serializers.MultipleChoiceField(choices=[1, 2, 3])
187187

@@ -210,7 +210,7 @@ def test_nested_serializer_with_list_multipart(self):
210210

211211

212212
class TestNotRequiredNestedSerializerWithMany:
213-
def setup(self):
213+
def setup_method(self):
214214
class NestedSerializer(serializers.Serializer):
215215
one = serializers.IntegerField(max_value=10)
216216

0 commit comments

Comments
 (0)