Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Switch from pytest.yield_fixture to just pytest.fixture, to remove warnings when running tests

Browse Source
This commit is contained in:
Micah Lee 2022-03-06 14:01:32 -08:00
parent b068e83852
commit 5ada415e8e
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
desktop/tests/conftest.py
View File

@ -78,8 +78,7 @@ def temp_dir_1024(temp_dir):
return new_temp_dir return new_temp_dir
# pytest > 2.9 only needs @pytest.fixture @pytest.fixture
@pytest.yield_fixture
def temp_dir_1024_delete(temp_dir): def temp_dir_1024_delete(temp_dir):
"""Create a temporary directory that has a single file of a """Create a temporary directory that has a single file of a
particular size (1024 bytes). The temporary directory (including particular size (1024 bytes). The temporary directory (including
@ -102,8 +101,7 @@ def temp_file_1024(temp_dir):
return tmp_file.name return tmp_file.name
# pytest > 2.9 only needs @pytest.fixture @pytest.fixture
@pytest.yield_fixture
def temp_file_1024_delete(temp_dir): def temp_file_1024_delete(temp_dir):
""" """
Create a temporary file of a particular size (1024 bytes). Create a temporary file of a particular size (1024 bytes).
@ -117,8 +115,7 @@ def temp_file_1024_delete(temp_dir):
yield tmp_file.name yield tmp_file.name
# pytest > 2.9 only needs @pytest.fixture @pytest.fixture(scope="session")
@pytest.yield_fixture(scope="session")
def custom_zw(): def custom_zw():
zw = web.share_mode.ZipWriter( zw = web.share_mode.ZipWriter(
common.Common(), common.Common(),
@ -130,8 +127,7 @@ def custom_zw():
os.remove(zw.zip_filename) os.remove(zw.zip_filename)
# pytest > 2.9 only needs @pytest.fixture @pytest.fixture(scope="session")
@pytest.yield_fixture(scope="session")
def default_zw(): def default_zw():
zw = web.share_mode.ZipWriter(common.Common()) zw = web.share_mode.ZipWriter(common.Common())
yield zw yield zw