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

End web thread successfully when cleaning up after a tab, which prevents crashes after running the tests; and fix msi_filename in Windows build script

Browse Source
This commit is contained in:
Micah Lee 2020-11-09 19:47:57 -08:00
parent a8ef55550f
commit f67e7ce678
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/package/windows/build.py
View File

@ -39,7 +39,9 @@ def main():
print("○ Create the binary") print("○ Create the binary")
run(["briefcase", "create"], desktop_dir) run(["briefcase", "create"], desktop_dir)
run(["briefcase", "package"], desktop_dir) run(["briefcase", "package"], desktop_dir)
msi_filename = glob.glob(os.path.join(cli_dir, "windows", "OnionShare-*.msi"))[0] msi_filename = glob.glob(os.path.join(desktop_dir, "windows", "OnionShare-*.msi"))[
0
]
print(f"○ Created unsigned installer: {msi_filename}") print(f"○ Created unsigned installer: {msi_filename}")
print(f"○ Signing installer") print(f"○ Signing installer")

2
desktop/src/onionshare/tab/tab.py
View File

@ -663,4 +663,6 @@ class Tab(QtWidgets.QWidget):
return False return False
def cleanup(self): def cleanup(self):
self.get_mode().web_thread.quit()
self.get_mode().web_thread.wait()
self.app.cleanup() self.app.cleanup()

6
desktop/tests/run.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
pytest -v tests/test_gui_tabs.py pytest -v tests/test_gui_tabs.py && \
pytest -v tests/test_gui_share.py pytest -v tests/test_gui_share.py && \
pytest -v tests/test_gui_receive.py pytest -v tests/test_gui_receive.py && \
pytest -v tests/test_gui_website.py pytest -v tests/test_gui_website.py