diff options
author | Miguel Jacq <mig@mig5.net> | 2018-02-25 08:27:46 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-25 08:27:46 +1100 |
commit | dface51dd0e00e4316d5384d14fe77568e51bf41 (patch) | |
tree | 38400a42f9d8db3cc19eecacaf046a2f76dcd9c2 /test | |
parent | 6b7a6a9ec49ea9b33f9046526e8284f665eb6369 (diff) | |
parent | 560f27fc76f8b33c1d6e62c02db181b0c6ce8079 (diff) | |
download | onionshare-dface51dd0e00e4316d5384d14fe77568e51bf41.tar.gz onionshare-dface51dd0e00e4316d5384d14fe77568e51bf41.zip |
Merge pull request #588 from micahflee/ux-update
Major user experience update
Diffstat (limited to 'test')
-rw-r--r-- | test/conftest.py | 6 | ||||
-rw-r--r-- | test/test_onionshare_settings.py | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/test/conftest.py b/test/conftest.py index 0a3bc806..8f10162b 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,13 +1,15 @@ +import sys +# Force tests to look for resources in the source code tree +sys.onionshare_dev_mode = True + import os import shutil -import sys import tempfile import pytest from onionshare import common - @pytest.fixture def temp_dir_1024(): """ Create a temporary directory that has a single file of a diff --git a/test/test_onionshare_settings.py b/test/test_onionshare_settings.py index 24c46042..e50eee41 100644 --- a/test/test_onionshare_settings.py +++ b/test/test_onionshare_settings.py @@ -55,6 +55,7 @@ class TestSettings: 'auth_password': '', 'close_after_first_download': True, 'systray_notifications': True, + 'shutdown_timeout': False, 'use_stealth': False, 'use_autoupdate': True, 'autoupdate_timestamp': None, |