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

Merge develop branch and fix conflicts

Browse source
This commit is contained in:
Miguel Jacq 2018-11-13 14:45:40 +11:00
commit d3b5e1e256
No known key found for this signature in database
GPG key ID: EEA4341C6D97A0B6
105 changed files with 3248 additions and 4862 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/test_onionshare_settings.py
View file

@ -40,7 +40,7 @@ def settings_obj(sys_onionshare_dev_mode, platform_linux):
class TestSettings:
def test_init(self, settings_obj):
assert settings_obj._settings == settings_obj.default_settings == {
expected_settings = {
'version': 'DUMMY_VERSION_1.2.3',
'connection_type': 'bundled',
'control_port_address': '127.0.0.1',
@ -67,6 +67,11 @@ class TestSettings:
'downloads_dir': os.path.expanduser('~/OnionShare'),
'public_mode': False
}
for key in settings_obj._settings:
# Skip locale, it will not always default to the same thing
if key != 'locale':
assert settings_obj._settings[key] == settings_obj.default_settings[key]
assert settings_obj._settings[key] == expected_settings[key]
def test_fill_in_defaults(self, settings_obj):
del settings_obj._settings['version']