diff options
author | Micah Lee <micah@micahflee.com> | 2019-10-13 14:35:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-13 14:35:40 -0400 |
commit | 896659c6963c14c4e047cff7f3d421977060ed23 (patch) | |
tree | 660468dd7478fb001ced211a4a33ae28a1b5f9a4 /tests/TorGuiReceiveTest.py | |
parent | bbf6c02da645fcd4fc50db18dd341178ad4fa2e6 (diff) | |
parent | 7d24bf9ffcd1e21e087431c21bfc658803a61ab6 (diff) | |
download | onionshare-2.2.tar.gz onionshare-2.2.zip |
Merge pull request #1048 from micahflee/developv2.2
Version 2.2
Diffstat (limited to 'tests/TorGuiReceiveTest.py')
-rw-r--r-- | tests/TorGuiReceiveTest.py | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/tests/TorGuiReceiveTest.py b/tests/TorGuiReceiveTest.py index a21dd4fc..18a00643 100644 --- a/tests/TorGuiReceiveTest.py +++ b/tests/TorGuiReceiveTest.py @@ -3,28 +3,29 @@ import requests from PyQt5 import QtTest from .TorGuiBaseTest import TorGuiBaseTest -class TorGuiReceiveTest(TorGuiBaseTest): +class TorGuiReceiveTest(TorGuiBaseTest): def upload_file(self, public_mode, file_to_upload, expected_file): - '''Test that we can upload the file''' + """Test that we can upload the file""" (socks_address, socks_port) = self.gui.app.onion.get_tor_socks_port() session = requests.session() session.proxies = {} - session.proxies['http'] = 'socks5h://{}:{}'.format(socks_address, socks_port) - files = {'file[]': open(file_to_upload, 'rb')} + session.proxies["http"] = "socks5h://{}:{}".format(socks_address, socks_port) + files = {"file[]": open(file_to_upload, "rb")} if not public_mode: - path = 'http://{}/{}/upload'.format(self.gui.app.onion_host, self.gui.receive_mode.web.slug) + path = "http://{}/{}/upload".format( + self.gui.app.onion_host, self.gui.receive_mode.web.password + ) else: - path = 'http://{}/upload'.format(self.gui.app.onion_host) + path = "http://{}/upload".format(self.gui.app.onion_host) response = session.post(path, files=files) QtTest.QTest.qWait(4000) self.assertTrue(os.path.isfile(expected_file)) - # 'Grouped' tests follow from here def run_all_receive_mode_tests(self, public_mode, receive_allow_receiver_shutdown): - '''Run a full suite of tests in Receive mode''' + """Run a full suite of tests in Receive mode""" self.click_mode(self.gui.receive_mode) self.history_is_not_visible(self.gui.receive_mode) self.click_toggle_history(self.gui.receive_mode) @@ -35,19 +36,23 @@ class TorGuiReceiveTest(TorGuiBaseTest): self.server_is_started(self.gui.receive_mode, startup_time=45000) self.web_server_is_running() self.have_an_onion_service() - self.have_a_slug(self.gui.receive_mode, public_mode) + self.have_a_password(self.gui.receive_mode, public_mode) self.url_description_shown(self.gui.receive_mode) self.have_copy_url_button(self.gui.receive_mode, public_mode) self.server_status_indicator_says_started(self.gui.receive_mode) - self.web_page(self.gui.receive_mode, 'Select the files you want to send, then click', public_mode) - self.upload_file(public_mode, '/tmp/test.txt', '/tmp/OnionShare/test.txt') + self.web_page( + self.gui.receive_mode, + "Select the files you want to send, then click", + public_mode, + ) + self.upload_file(public_mode, "/tmp/test.txt", "/tmp/OnionShare/test.txt") self.history_widgets_present(self.gui.receive_mode) self.counter_incremented(self.gui.receive_mode, 1) - self.upload_file(public_mode, '/tmp/test.txt', '/tmp/OnionShare/test-2.txt') + self.upload_file(public_mode, "/tmp/test.txt", "/tmp/OnionShare/test-2.txt") self.counter_incremented(self.gui.receive_mode, 2) - self.upload_file(public_mode, '/tmp/testdir/test', '/tmp/OnionShare/test') + self.upload_file(public_mode, "/tmp/testdir/test", "/tmp/OnionShare/test") self.counter_incremented(self.gui.receive_mode, 3) - self.upload_file(public_mode, '/tmp/testdir/test', '/tmp/OnionShare/test-2') + self.upload_file(public_mode, "/tmp/testdir/test", "/tmp/OnionShare/test-2") self.counter_incremented(self.gui.receive_mode, 4) self.history_indicator(self.gui.receive_mode, public_mode) self.server_is_stopped(self.gui.receive_mode, False) @@ -56,4 +61,3 @@ class TorGuiReceiveTest(TorGuiBaseTest): self.server_working_on_start_button_pressed(self.gui.receive_mode) self.server_is_started(self.gui.receive_mode, startup_time=45000) self.history_indicator(self.gui.receive_mode, public_mode) - |