Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-04 17:05:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixture instead of yield_fixture (2), remove parentheses

Browse Source
This commit is contained in:
Delirious Lettuce 2017-07-08 11:29:19 -06:00
parent 711ae30ba9
commit 5132ef8b4f
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/conftest.py
View File

@ -8,8 +8,7 @@ import pytest
from onionshare import common from onionshare import common
# pytest > 2.9 only needs @pytest.fixture @pytest.fixture
@pytest.yield_fixture()
def temp_dir_1024(): def temp_dir_1024():
""" 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). particular size (1024 bytes).
@ -19,11 +18,11 @@ def temp_dir_1024():
tmp_file, tmp_file_path = tempfile.mkstemp(dir=tmp_dir) tmp_file, tmp_file_path = tempfile.mkstemp(dir=tmp_dir)
with open(tmp_file, 'wb') as f: with open(tmp_file, 'wb') as f:
f.write(b'*' * 1024) f.write(b'*' * 1024)
yield tmp_dir return tmp_dir
# pytest > 2.9 only needs @pytest.fixture # pytest > 2.9 only needs @pytest.fixture
@pytest.yield_fixture() @pytest.yield_fixture
def temp_dir_1024_delete(): def temp_dir_1024_delete():
""" 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
@ -37,18 +36,17 @@ def temp_dir_1024_delete():
yield tmp_dir yield tmp_dir
# pytest > 2.9 only needs @pytest.fixture @pytest.fixture
@pytest.yield_fixture()
def temp_file_1024(): def temp_file_1024():
""" Create a temporary file of a particular size (1024 bytes). """ """ Create a temporary file of a particular size (1024 bytes). """
with tempfile.NamedTemporaryFile(delete=False) as tmp_file: with tempfile.NamedTemporaryFile(delete=False) as tmp_file:
tmp_file.write(b'*' * 1024) tmp_file.write(b'*' * 1024)
yield tmp_file.name return tmp_file.name
# pytest > 2.9 only needs @pytest.fixture # pytest > 2.9 only needs @pytest.fixture
@pytest.yield_fixture() @pytest.yield_fixture
def temp_file_1024_delete(): def temp_file_1024_delete():
""" """
Create a temporary file of a particular size (1024 bytes). Create a temporary file of a particular size (1024 bytes).
@ -108,7 +106,7 @@ def platform_darwin(monkeypatch):
monkeypatch.setattr('platform.system', lambda: 'Darwin') monkeypatch.setattr('platform.system', lambda: 'Darwin')
@pytest.fixture @pytest.fixture # (scope="session")
def platform_linux(monkeypatch): def platform_linux(monkeypatch):
monkeypatch.setattr('platform.system', lambda: 'Linux') monkeypatch.setattr('platform.system', lambda: 'Linux')
@ -144,7 +142,7 @@ def sys_meipass(monkeypatch):
'sys._MEIPASS', os.path.expanduser('~'), raising=False) 'sys._MEIPASS', os.path.expanduser('~'), raising=False)
@pytest.fixture @pytest.fixture # (scope="session")
def sys_onionshare_dev_mode(monkeypatch): def sys_onionshare_dev_mode(monkeypatch):
monkeypatch.setattr('sys.onionshare_dev_mode', True, raising=False) monkeypatch.setattr('sys.onionshare_dev_mode', True, raising=False)