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

Fix conflict from receiver-mode-gui branch

Browse source
This commit is contained in:
Miguel Jacq 2018-09-04 11:48:39 +10:00
commit b0d2183a3e
8 changed files with 91 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
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):