Skip to content

Commit bdb9ba1

Browse files
authored
Remove pytest deprecated method (#19)
- Replace all `def setup(self)` by `def setup_method(self, method)` - Replace all `def teardown(self)` by `def teardown_method(self, method)`
1 parent 079d162 commit bdb9ba1

13 files changed

+23
-23
lines changed

scripts/coverage.sh

100644100755
File mode changed.

tests/test_content_type_validator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def __repr__(self):
6464

6565

6666
class TestContentTypeValidator:
67-
def setup(self) -> None:
67+
def setup_method(self, method) -> None:
6868
Base.metadata.create_all(engine)
6969
StorageManager._clear()
7070
StorageManager.add_storage("test", get_test_container("content-type-validator"))
@@ -98,7 +98,7 @@ def test_content_type_validator(
9898
session.refresh(attachment)
9999
assert attachment.content.file is not None
100100

101-
def teardown(self):
101+
def teardown_method(self, method):
102102
for obj in StorageManager.get().list_objects():
103103
obj.delete()
104104
StorageManager.get().delete()

tests/test_image_field.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def __repr__(self):
6464

6565

6666
class TestImageField:
67-
def setup(self) -> None:
67+
def setup_method(self, method) -> None:
6868
Base.metadata.create_all(engine)
6969
StorageManager._clear()
7070
StorageManager.add_storage("test", get_test_container("test-image-field"))
@@ -92,7 +92,7 @@ def test_create_image(self, fake_valid_image, fake_valid_image_content) -> None:
9292
assert book.cover["width"] is not None
9393
assert book.cover["height"] is not None
9494

95-
def teardown(self):
95+
def teardown_method(self, method):
9696
for obj in StorageManager.get().list_objects():
9797
obj.delete()
9898
StorageManager.get().delete()

tests/test_image_validator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def __repr__(self):
130130

131131

132132
class TestImageValidator:
133-
def setup(self) -> None:
133+
def setup_method(self, method) -> None:
134134
Base.metadata.create_all(engine)
135135
StorageManager._clear()
136136
StorageManager.add_storage("test", get_test_container("test-image-validator"))
@@ -188,7 +188,7 @@ def test_valid_image(self, fake_valid_image) -> None:
188188
).scalar_one()
189189
assert book.cover.file is not None
190190

191-
def teardown(self):
191+
def teardown_method(self, method):
192192
for obj in StorageManager.get().list_objects():
193193
obj.delete()
194194
StorageManager.get().delete()

tests/test_metadata.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
class TestMetadata:
11-
def setup(self) -> None:
11+
def setup_method(self, method) -> None:
1212
StorageManager._clear()
1313
StorageManager.add_storage("test", get_test_container("test-metadata"))
1414

@@ -44,5 +44,5 @@ def test_no_metadata(self):
4444
assert stored_file.content_type == "application/octet-stream"
4545
StorageManager.delete_file("test/test_metadata.txt")
4646

47-
def teardown(self):
47+
def teardown_method(self, method):
4848
StorageManager.get().delete()

tests/test_multiple_field.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def __repr__(self):
4242

4343

4444
class TestMultipleField:
45-
def setup(self) -> None:
45+
def setup_method(self, method) -> None:
4646
Base.metadata.create_all(engine)
4747
StorageManager._clear()
4848
StorageManager.add_storage("test", get_test_container("test-multiple-field"))
@@ -355,7 +355,7 @@ def test_delete_existing_multiple_content_rollback(self, fake_file) -> None:
355355
for file_id in file_ids:
356356
assert StorageManager.get().get_object(file_id) is not None
357357

358-
def teardown(self):
358+
def teardown_method(self, method):
359359
for obj in StorageManager.get().list_objects():
360360
obj.delete()
361361
StorageManager.get().delete()

tests/test_multiple_storage.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Attachment(Base):
2121

2222

2323
class TestMultipleStorage:
24-
def setup(self) -> None:
24+
def setup_method(self, method) -> None:
2525
Base.metadata.create_all(engine)
2626
StorageManager._clear()
2727
StorageManager.add_storage("first", get_test_container("first"))
@@ -50,7 +50,7 @@ def test_multiple_storage(self) -> None:
5050
StorageManager.get("second").get_object(first_fileid)
5151
session.rollback()
5252

53-
def teardown(self):
53+
def teardown_method(self, method):
5454
StorageManager.get("first").delete()
5555
StorageManager.get("second").delete()
5656
Base.metadata.drop_all(engine)

tests/test_processor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __repr__(self):
4848

4949

5050
class TestThumbnailGenerator:
51-
def setup(self) -> None:
51+
def setup_method(self, method) -> None:
5252
Base.metadata.create_all(engine)
5353
StorageManager._clear()
5454
StorageManager.add_storage("test", get_test_container("test-processor"))
@@ -70,7 +70,7 @@ def test_create_image_with_thumbnail(self, fake_image) -> None:
7070
assert book.cover["thumbnail"]["width"] == thumbnail.width
7171
assert book.cover["thumbnail"]["height"] == thumbnail.height
7272

73-
def teardown(self):
73+
def teardown_method(self, method):
7474
for obj in StorageManager.get().list_objects():
7575
obj.delete()
7676
StorageManager.get().delete()

tests/test_result_value.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def __repr__(self):
5252

5353

5454
class TestResultValue:
55-
def setup(self) -> None:
55+
def setup_method(self, method) -> None:
5656
Base.metadata.create_all(engine)
5757
StorageManager._clear()
5858
StorageManager.add_storage("test", get_dummy_container("test-result-value"))
@@ -147,5 +147,5 @@ def test_multiple_column_cannot_edit_after_save(self) -> None:
147147
with pytest.raises(TypeError):
148148
delattr(content, "dummy_attr")
149149

150-
def teardown(self):
150+
def teardown_method(self, method):
151151
Base.metadata.drop_all(engine)

tests/test_single_field.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def __repr__(self):
6363

6464

6565
class TestSingleField:
66-
def setup(self) -> None:
66+
def setup_method(self, method) -> None:
6767
Base.metadata.create_all(engine)
6868
StorageManager._clear()
6969
StorageManager.add_storage("test", get_test_container("test-simple-field"))
@@ -301,7 +301,7 @@ def test_relationship_cascade_delete_rollback(
301301
session.rollback()
302302
assert StorageManager.get_file(file_path) is not None
303303

304-
def teardown(self):
304+
def teardown_method(self, method):
305305
for obj in StorageManager.get().list_objects():
306306
obj.delete()
307307
StorageManager.get().delete()

tests/test_size_validator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def __repr__(self):
4747

4848

4949
class TestSizeValidator:
50-
def setup(self) -> None:
50+
def setup_method(self, method) -> None:
5151
Base.metadata.create_all(engine)
5252
StorageManager._clear()
5353
StorageManager.add_storage("test", get_test_container("test-size-validator"))
@@ -81,7 +81,7 @@ def test_size_validator_valid_size(self, fake_valid_file) -> None:
8181
print(attachment.content.file)
8282
assert attachment.content.file is not None
8383

84-
def teardown(self):
84+
def teardown_method(self, method):
8585
for obj in StorageManager.get().list_objects():
8686
obj.delete()
8787
StorageManager.get().delete()

tests/test_sqlmodel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Attachment(SQLModel, table=True):
3636

3737

3838
class TestSQLModel:
39-
def setup(self) -> None:
39+
def setup_method(self, method) -> None:
4040
SQLModel.metadata.create_all(engine)
4141
StorageManager._clear()
4242
StorageManager.add_storage("test", get_test_container("test-sqlmodel"))
@@ -160,7 +160,7 @@ def test_delete_existing_rollback(self, fake_file) -> None:
160160
session.rollback()
161161
assert StorageManager.get().get_object(file_id) is not None
162162

163-
def teardown(self):
163+
def teardown_method(self, method):
164164
for obj in StorageManager.get().list_objects():
165165
obj.delete()
166166
StorageManager.get().delete()

tests/test_storage_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
class TestStorageManager:
8-
def setup(self) -> None:
8+
def setup_method(self, method) -> None:
99
StorageManager._clear()
1010

1111
def test_first_configured_is_default(self) -> None:

0 commit comments

Comments
 (0)