Merge pull request #588 from micahflee/ux-update

Major user experience update

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

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,