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

Fix conflicts

Browse source
This commit is contained in:
Miguel Jacq 2018-09-16 13:37:22 +10:00
commit 3a7ae401af
No known key found for this signature in database
GPG key ID: EEA4341C6D97A0B6
51 changed files with 759 additions and 887 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/test_onionshare_settings.py
View file

@ -57,7 +57,6 @@ class TestSettings:
'autoupdate_timestamp': None,
'no_bridges': True,
'tor_bridges_use_obfs4': False,
'tor_bridges_use_meek_lite_amazon': False,
'tor_bridges_use_meek_lite_azure': False,
'tor_bridges_use_custom_bridges': '',
'use_legacy_v2_onions': False,
@ -67,7 +66,7 @@ class TestSettings:
'hidservauth_string': '',
'downloads_dir': os.path.expanduser('~/OnionShare'),
'receive_allow_receiver_shutdown': True,
'receive_public_mode': False
'public_mode': False
}
def test_fill_in_defaults(self, settings_obj):
@ -127,7 +126,6 @@ class TestSettings:
assert settings_obj.get('autoupdate_timestamp') is None
assert settings_obj.get('no_bridges') is True
assert settings_obj.get('tor_bridges_use_obfs4') is False
assert settings_obj.get('tor_bridges_use_meek_lite_amazon') is False
assert settings_obj.get('tor_bridges_use_meek_lite_azure') is False
assert settings_obj.get('tor_bridges_use_custom_bridges') == ''

26
test/test_onionshare_web.py
View file

@ -38,11 +38,11 @@ DEFAULT_ZW_FILENAME_REGEX = re.compile(r'^onionshare_[a-z2-7]{6}.zip$')
RANDOM_STR_REGEX = re.compile(r'^[a-z2-7]+$')
def web_obj(common_obj, recieve_mode, num_files=0):
def web_obj(common_obj, receive_mode, num_files=0):
""" Creates a Web object, in either share mode or receive mode, ready for testing """
common_obj.load_settings()
web = Web(common_obj, False, recieve_mode)
web = Web(common_obj, False, receive_mode)
web.generate_slug()
web.stay_open = True
web.running = True
@ -50,7 +50,7 @@ def web_obj(common_obj, recieve_mode, num_files=0):
web.app.testing = True
# Share mode
if not recieve_mode:
if not receive_mode:
# Add files
files = []
for i in range(num_files):
@ -61,7 +61,7 @@ def web_obj(common_obj, recieve_mode, num_files=0):
# Receive mode
else:
pass
return web
@ -89,7 +89,7 @@ class TestWeb:
res.get_data()
assert res.status_code == 200
assert res.mimetype == 'application/zip'
def test_share_mode_close_after_first_download_on(self, common_obj, temp_file_1024):
web = web_obj(common_obj, False, 3)
web.stay_open = False
@ -104,7 +104,7 @@ class TestWeb:
assert res.mimetype == 'application/zip'
assert web.running == False
def test_share_mode_close_after_first_download_off(self, common_obj, temp_file_1024):
web = web_obj(common_obj, False, 3)
web.stay_open = True
@ -118,7 +118,7 @@ class TestWeb:
assert res.status_code == 200
assert res.mimetype == 'application/zip'
assert web.running == True
def test_receive_mode(self, common_obj):
web = web_obj(common_obj, True)
assert web.receive_mode is True
@ -137,7 +137,7 @@ class TestWeb:
res = c.get('/{}'.format(web.slug))
res.get_data()
assert res.status_code == 200
def test_receive_mode_allow_receiver_shutdown_on(self, common_obj):
web = web_obj(common_obj, True)
@ -152,7 +152,7 @@ class TestWeb:
# Should return ok, and server should stop
assert res.status_code == 200
assert web.running == False
def test_receive_mode_allow_receiver_shutdown_off(self, common_obj):
web = web_obj(common_obj, True)
@ -168,9 +168,9 @@ class TestWeb:
assert res.status_code == 302
assert web.running == True
def test_receive_mode_receive_public_mode_on(self, common_obj):
def test_public_mode_on(self, common_obj):
web = web_obj(common_obj, True)
common_obj.settings.set('receive_public_mode', True)
common_obj.settings.set('public_mode', True)
with web.app.test_client() as c:
# Upload page should be accessible from both / and /[slug]
@ -182,9 +182,9 @@ class TestWeb:
data2 = res.get_data()
assert res.status_code == 200
def test_receive_mode_receive_public_mode_off(self, common_obj):
def test_public_mode_off(self, common_obj):
web = web_obj(common_obj, True)
common_obj.settings.set('receive_public_mode', False)
common_obj.settings.set('public_mode', False)
with web.app.test_client() as c:
# / should be a 404