diff options
| author | Micah Lee <micah@micahflee.com> | 2019-03-10 13:58:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-10 13:58:11 -0700 |
| commit | 1498dfeca099a7b90fe5bdf2acf94f9bf30c396b (patch) | |
| tree | 8056097830afc05e988a5de33f4f4e77ba10b562 /tests | |
| parent | f13f36f5724564bd7bfa8fd504b107b8cf385ac5 (diff) | |
| parent | 93a4905b72049adcb37d71e6707c14321980fa27 (diff) | |
| download | onionshare-1498dfeca099a7b90fe5bdf2acf94f9bf30c396b.tar.gz onionshare-1498dfeca099a7b90fe5bdf2acf94f9bf30c396b.zip | |
Merge pull request #926 from mig5/fix_settings_in_web_test
Use a custom Settings object in test_onionshare_web.py, rather than potentially load non-ephemeral settings
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_onionshare_web.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_onionshare_web.py b/tests/test_onionshare_web.py index 3f9540ae..0c29859b 100644 --- a/tests/test_onionshare_web.py +++ b/tests/test_onionshare_web.py @@ -41,7 +41,7 @@ RANDOM_STR_REGEX = re.compile(r'^[a-z2-7]+$') def web_obj(common_obj, mode, num_files=0): """ Creates a Web object, in either share mode or receive mode, ready for testing """ - common_obj.load_settings() + common_obj.settings = Settings(common_obj) strings.load_strings(common_obj) web = Web(common_obj, False, mode) web.generate_slug() |