mirror of
https://github.com/onionshare/onionshare.git
synced 2024-10-01 01:35:40 -04:00
Merge in develop
This commit is contained in:
commit
18f83589aa
@ -56,5 +56,8 @@ class CompressThread(QtCore.QThread):
|
|||||||
|
|
||||||
# Let the Web and ZipWriter objects know that we're canceling compression early
|
# Let the Web and ZipWriter objects know that we're canceling compression early
|
||||||
self.mode.web.cancel_compression = True
|
self.mode.web.cancel_compression = True
|
||||||
if self.mode.web.zip_writer:
|
try:
|
||||||
self.mode.web.zip_writer.cancel_compression = True
|
self.mode.web.zip_writer.cancel_compression = True
|
||||||
|
except AttributeError:
|
||||||
|
# we never made it as far as creating a ZipWriter object
|
||||||
|
pass
|
||||||
|
@ -95,7 +95,7 @@ class CommonTests(object):
|
|||||||
|
|
||||||
def test_server_status_indicator_says_starting(self, mode):
|
def test_server_status_indicator_says_starting(self, mode):
|
||||||
'''Test that the Server Status indicator shows we are Starting'''
|
'''Test that the Server Status indicator shows we are Starting'''
|
||||||
self.assertEquals(mode.server_status_label.text(), strings._('gui_status_indicator_share_working', True))
|
self.assertEquals(mode.server_status_label.text(), strings._('gui_status_indicator_share_working'))
|
||||||
|
|
||||||
def test_settings_button_is_hidden(self):
|
def test_settings_button_is_hidden(self):
|
||||||
'''Test that the settings button is hidden when the server starts'''
|
'''Test that the settings button is hidden when the server starts'''
|
||||||
@ -132,9 +132,9 @@ class CommonTests(object):
|
|||||||
def test_server_status_indicator_says_started(self, mode):
|
def test_server_status_indicator_says_started(self, mode):
|
||||||
'''Test that the Server Status indicator shows we are started'''
|
'''Test that the Server Status indicator shows we are started'''
|
||||||
if type(mode) == ReceiveMode:
|
if type(mode) == ReceiveMode:
|
||||||
self.assertEquals(mode.server_status_label.text(), strings._('gui_status_indicator_receive_started', True))
|
self.assertEquals(mode.server_status_label.text(), strings._('gui_status_indicator_receive_started'))
|
||||||
if type(mode) == ShareMode:
|
if type(mode) == ShareMode:
|
||||||
self.assertEquals(mode.server_status_label.text(), strings._('gui_status_indicator_share_started', True))
|
self.assertEquals(mode.server_status_label.text(), strings._('gui_status_indicator_share_started'))
|
||||||
|
|
||||||
def test_web_page(self, mode, string, public_mode):
|
def test_web_page(self, mode, string, public_mode):
|
||||||
'''Test that the web page contains a string'''
|
'''Test that the web page contains a string'''
|
||||||
@ -193,9 +193,9 @@ class CommonTests(object):
|
|||||||
self.assertEquals(self.gui.receive_mode.server_status_label.text(), strings._('gui_status_indicator_receive_stopped', True))
|
self.assertEquals(self.gui.receive_mode.server_status_label.text(), strings._('gui_status_indicator_receive_stopped', True))
|
||||||
if type(mode) == ShareMode:
|
if type(mode) == ShareMode:
|
||||||
if stay_open:
|
if stay_open:
|
||||||
self.assertEquals(self.gui.share_mode.server_status_label.text(), strings._('gui_status_indicator_share_stopped', True))
|
self.assertEqual(self.gui.share_mode.server_status_label.text(), strings._('gui_status_indicator_share_stopped', True))
|
||||||
else:
|
else:
|
||||||
self.assertEquals(self.gui.share_mode.server_status_label.text(), strings._('closing_automatically', True))
|
self.assertEqual(self.gui.share_mode.server_status_label.text(), strings._('closing_automatically', True))
|
||||||
|
|
||||||
# Auto-stop timer tests
|
# Auto-stop timer tests
|
||||||
def test_set_timeout(self, mode, timeout):
|
def test_set_timeout(self, mode, timeout):
|
||||||
@ -245,7 +245,7 @@ class CommonTests(object):
|
|||||||
'''Test that we can also delete a file by clicking on its [X] widget'''
|
'''Test that we can also delete a file by clicking on its [X] widget'''
|
||||||
self.gui.share_mode.server_status.file_selection.file_list.add_file('/etc/hosts')
|
self.gui.share_mode.server_status.file_selection.file_list.add_file('/etc/hosts')
|
||||||
QtTest.QTest.mouseClick(self.gui.share_mode.server_status.file_selection.file_list.item(0).item_button, QtCore.Qt.LeftButton)
|
QtTest.QTest.mouseClick(self.gui.share_mode.server_status.file_selection.file_list.item(0).item_button, QtCore.Qt.LeftButton)
|
||||||
self.assertEquals(self.gui.share_mode.server_status.file_selection.get_num_files(), 0)
|
self.assertEqual(self.gui.share_mode.server_status.file_selection.get_num_files(), 0)
|
||||||
|
|
||||||
def test_file_selection_widget_readd_files(self):
|
def test_file_selection_widget_readd_files(self):
|
||||||
'''Re-add some files to the list so we can share'''
|
'''Re-add some files to the list so we can share'''
|
||||||
@ -284,7 +284,7 @@ class CommonTests(object):
|
|||||||
|
|
||||||
zip = zipfile.ZipFile('/tmp/download.zip')
|
zip = zipfile.ZipFile('/tmp/download.zip')
|
||||||
QtTest.QTest.qWait(2000)
|
QtTest.QTest.qWait(2000)
|
||||||
self.assertEquals('onionshare', zip.read('test.txt').decode('utf-8'))
|
self.assertEqual('onionshare', zip.read('test.txt').decode('utf-8'))
|
||||||
|
|
||||||
def test_add_button_visible(self):
|
def test_add_button_visible(self):
|
||||||
'''Test that the add button should be visible'''
|
'''Test that the add button should be visible'''
|
||||||
|
@ -74,9 +74,12 @@ class OnionShareGuiTest(unittest.TestCase):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def tearDownClass(cls):
|
def tearDownClass(cls):
|
||||||
'''Clean up after tests'''
|
'''Clean up after tests'''
|
||||||
os.remove('/tmp/test.txt')
|
try:
|
||||||
os.remove('/tmp/OnionShare/test.txt')
|
os.remove('/tmp/test.txt')
|
||||||
os.remove('/tmp/OnionShare/test-2.txt')
|
os.remove('/tmp/OnionShare/test.txt')
|
||||||
|
os.remove('/tmp/OnionShare/test-2.txt')
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
@pytest.mark.run(order=1)
|
@pytest.mark.run(order=1)
|
||||||
def test_gui_loaded(self):
|
def test_gui_loaded(self):
|
||||||
|
197
tests_gui_tor/onionshare_790_cancel_on_second_share_test.py
Normal file
197
tests_gui_tor/onionshare_790_cancel_on_second_share_test.py
Normal file
@ -0,0 +1,197 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import unittest
|
||||||
|
import pytest
|
||||||
|
import json
|
||||||
|
|
||||||
|
from PyQt5 import QtWidgets
|
||||||
|
|
||||||
|
from onionshare.common import Common
|
||||||
|
from onionshare.web import Web
|
||||||
|
from onionshare import onion, strings
|
||||||
|
from onionshare_gui import *
|
||||||
|
|
||||||
|
from .commontests import CommonTests
|
||||||
|
|
||||||
|
class OnionShareGuiTest(unittest.TestCase):
|
||||||
|
'''Test the OnionShare GUI'''
|
||||||
|
@classmethod
|
||||||
|
def setUpClass(cls):
|
||||||
|
'''Create the GUI'''
|
||||||
|
# Create our test file
|
||||||
|
testfile = open('/tmp/test.txt', 'w')
|
||||||
|
testfile.write('onionshare')
|
||||||
|
testfile.close()
|
||||||
|
common = Common()
|
||||||
|
common.define_css()
|
||||||
|
|
||||||
|
# Start the Onion
|
||||||
|
strings.load_strings(common)
|
||||||
|
|
||||||
|
testonion = onion.Onion(common)
|
||||||
|
global qtapp
|
||||||
|
qtapp = Application(common)
|
||||||
|
app = OnionShare(common, testonion, False, 0)
|
||||||
|
|
||||||
|
web = Web(common, False, True)
|
||||||
|
|
||||||
|
test_settings = {
|
||||||
|
"auth_password": "",
|
||||||
|
"auth_type": "no_auth",
|
||||||
|
"autoupdate_timestamp": "",
|
||||||
|
"close_after_first_download": True,
|
||||||
|
"connection_type": "bundled",
|
||||||
|
"control_port_address": "127.0.0.1",
|
||||||
|
"control_port_port": 9051,
|
||||||
|
"downloads_dir": "/tmp/OnionShare",
|
||||||
|
"hidservauth_string": "",
|
||||||
|
"no_bridges": True,
|
||||||
|
"private_key": "",
|
||||||
|
"public_mode": False,
|
||||||
|
"receive_allow_receiver_shutdown": True,
|
||||||
|
"save_private_key": False,
|
||||||
|
"shutdown_timeout": False,
|
||||||
|
"slug": "",
|
||||||
|
"socks_address": "127.0.0.1",
|
||||||
|
"socks_port": 9050,
|
||||||
|
"socket_file_path": "/var/run/tor/control",
|
||||||
|
"systray_notifications": True,
|
||||||
|
"tor_bridges_use_meek_lite_azure": False,
|
||||||
|
"tor_bridges_use_meek_lite_amazon": False,
|
||||||
|
"tor_bridges_use_custom_bridges": "",
|
||||||
|
"tor_bridges_use_obfs4": False,
|
||||||
|
"use_stealth": False,
|
||||||
|
"use_legacy_v2_onions": False,
|
||||||
|
"use_autoupdate": True,
|
||||||
|
"version": "1.3.1"
|
||||||
|
}
|
||||||
|
testsettings = '/tmp/testsettings.json'
|
||||||
|
open(testsettings, 'w').write(json.dumps(test_settings))
|
||||||
|
|
||||||
|
cls.gui = OnionShareGui(common, testonion, qtapp, app, ['/tmp/test.txt'], testsettings, False)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def tearDownClass(cls):
|
||||||
|
'''Clean up after tests'''
|
||||||
|
os.remove('/tmp/test.txt')
|
||||||
|
|
||||||
|
@pytest.mark.run(order=1)
|
||||||
|
def test_gui_loaded(self):
|
||||||
|
CommonTests.test_gui_loaded(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=2)
|
||||||
|
def test_windowTitle_seen(self):
|
||||||
|
CommonTests.test_windowTitle_seen(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=3)
|
||||||
|
def test_settings_button_is_visible(self):
|
||||||
|
CommonTests.test_settings_button_is_visible(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=4)
|
||||||
|
def test_server_status_bar_is_visible(self):
|
||||||
|
CommonTests.test_server_status_bar_is_visible(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=5)
|
||||||
|
def test_file_selection_widget_has_a_file(self):
|
||||||
|
CommonTests.test_file_selection_widget_has_a_file(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=6)
|
||||||
|
def test_info_widget_is_visible(self):
|
||||||
|
CommonTests.test_info_widget_is_visible(self, 'share')
|
||||||
|
|
||||||
|
@pytest.mark.run(order=7)
|
||||||
|
def test_history_is_visible(self):
|
||||||
|
CommonTests.test_history_is_visible(self, 'share')
|
||||||
|
|
||||||
|
@pytest.mark.run(order=8)
|
||||||
|
def test_deleting_only_file_hides_delete_button(self):
|
||||||
|
CommonTests.test_deleting_only_file_hides_delete_button(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=9)
|
||||||
|
def test_add_a_file_and_delete_using_its_delete_widget(self):
|
||||||
|
CommonTests.test_add_a_file_and_delete_using_its_delete_widget(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=10)
|
||||||
|
def test_file_selection_widget_readd_files(self):
|
||||||
|
CommonTests.test_file_selection_widget_readd_files(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=11)
|
||||||
|
def test_server_working_on_start_button_pressed(self):
|
||||||
|
CommonTests.test_server_working_on_start_button_pressed(self, 'share')
|
||||||
|
|
||||||
|
@pytest.mark.run(order=12)
|
||||||
|
def test_server_status_indicator_says_starting(self):
|
||||||
|
CommonTests.test_server_status_indicator_says_starting(self, 'share')
|
||||||
|
|
||||||
|
@pytest.mark.run(order=13)
|
||||||
|
def test_add_delete_buttons_hidden(self):
|
||||||
|
CommonTests.test_add_delete_buttons_hidden(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=14)
|
||||||
|
def test_settings_button_is_hidden(self):
|
||||||
|
CommonTests.test_settings_button_is_hidden(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=15)
|
||||||
|
def test_a_server_is_started(self):
|
||||||
|
CommonTests.test_a_server_is_started(self, 'share')
|
||||||
|
|
||||||
|
@pytest.mark.run(order=16)
|
||||||
|
def test_a_web_server_is_running(self):
|
||||||
|
CommonTests.test_a_web_server_is_running(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=17)
|
||||||
|
def test_have_a_slug(self):
|
||||||
|
CommonTests.test_have_a_slug(self, 'share', False)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=18)
|
||||||
|
def test_have_an_onion(self):
|
||||||
|
CommonTests.test_have_an_onion_service(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=19)
|
||||||
|
def test_url_description_shown(self):
|
||||||
|
CommonTests.test_url_description_shown(self, 'share')
|
||||||
|
|
||||||
|
@pytest.mark.run(order=20)
|
||||||
|
def test_have_copy_url_button(self):
|
||||||
|
CommonTests.test_have_copy_url_button(self, 'share')
|
||||||
|
|
||||||
|
@pytest.mark.run(order=21)
|
||||||
|
def test_server_status_indicator_says_started(self):
|
||||||
|
CommonTests.test_server_status_indicator_says_started(self, 'share')
|
||||||
|
|
||||||
|
@pytest.mark.run(order=22)
|
||||||
|
def test_server_is_stopped(self):
|
||||||
|
CommonTests.test_server_is_stopped(self, 'share', True)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=23)
|
||||||
|
def test_web_service_is_stopped(self):
|
||||||
|
CommonTests.test_web_service_is_stopped(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=24)
|
||||||
|
def test_server_working_on_start_button_pressed_round2(self):
|
||||||
|
CommonTests.test_server_working_on_start_button_pressed(self, 'share')
|
||||||
|
|
||||||
|
@pytest.mark.run(order=25)
|
||||||
|
def test_server_status_indicator_says_starting_round2(self):
|
||||||
|
CommonTests.test_server_status_indicator_says_starting(self, 'share')
|
||||||
|
|
||||||
|
@pytest.mark.run(order=26)
|
||||||
|
def test_cancel_the_share(self):
|
||||||
|
CommonTests.test_cancel_the_share(self, 'share')
|
||||||
|
|
||||||
|
@pytest.mark.run(order=27)
|
||||||
|
def test_server_is_stopped_round2(self):
|
||||||
|
CommonTests.test_server_is_stopped(self, 'share', False)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=28)
|
||||||
|
def test_web_service_is_stopped_round2(self):
|
||||||
|
CommonTests.test_web_service_is_stopped(self)
|
||||||
|
|
||||||
|
@pytest.mark.run(order=29)
|
||||||
|
def test_add_button_visible(self):
|
||||||
|
CommonTests.test_add_button_visible(self)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
Loading…
Reference in New Issue
Block a user