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

Move docs back to root, move onionshare_gui into briefcase app, and make modifications so briefcase app will work

Browse source
This commit is contained in:
Micah Lee 2020-10-13 17:28:54 -07:00
parent a54f99adf6
commit 5eb2bb6353
490 changed files with 226 additions and 14886 deletions
Download patch file Download diff file Expand all files Collapse all files

13
desktop/tests/conftest.py
View file

@ -12,7 +12,7 @@ import tempfile
import pytest
from onionshare import common, web, settings, strings
from onionshare_cli import common, web, settings
# The temporary directory for CLI tests
@ -20,9 +20,6 @@ test_temp_dir = None
def pytest_addoption(parser):
parser.addoption(
"--rungui", action="store_true", default=False, help="run GUI tests"
)
parser.addoption(
"--runtor", action="store_true", default=False, help="run tor tests"
)
@ -36,13 +33,6 @@ def pytest_collection_modifyitems(config, items):
if "tor" in item.keywords:
item.add_marker(skip_tor)
if not config.getoption("--rungui"):
# --rungui given in cli: do not skip GUI tests
skip_gui = pytest.mark.skip(reason="need --rungui option to run")
for item in items:
if "gui" in item.keywords:
item.add_marker(skip_gui)
@pytest.fixture
def temp_dir():
@ -205,5 +195,4 @@ def common_obj():
def settings_obj(sys_onionshare_dev_mode, platform_linux):
_common = common.Common()
_common.version = "DUMMY_VERSION_1.2.3"
strings.load_strings(_common)
return settings.Settings(_common)