diff options
Diffstat (limited to 'desktop')
34 files changed, 62 insertions, 57 deletions
diff --git a/desktop/onionshare/__init__.py b/desktop/onionshare/__init__.py index 40a91913..fbe75a27 100644 --- a/desktop/onionshare/__init__.py +++ b/desktop/onionshare/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/__main__.py b/desktop/onionshare/__main__.py index 3a7f3554..b526477c 100644 --- a/desktop/onionshare/__main__.py +++ b/desktop/onionshare/__main__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/gui_common.py b/desktop/onionshare/gui_common.py index 2a0bae4d..cda40c1e 100644 --- a/desktop/onionshare/gui_common.py +++ b/desktop/onionshare/gui_common.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/main_window.py b/desktop/onionshare/main_window.py index 546592a1..255cb405 100644 --- a/desktop/onionshare/main_window.py +++ b/desktop/onionshare/main_window.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -163,6 +163,7 @@ class MainWindow(QtWidgets.QMainWindow): # Start the "Connecting to Tor" dialog, which calls onion.connect() tor_con = TorConnectionDialog(self.common) tor_con.canceled.connect(self.tor_connection_canceled) + tor_con.success.connect(self.tabs.tor_is_connected) tor_con.open_tor_settings.connect(self.tor_connection_open_tor_settings) if not self.common.gui.local_only: tor_con.start() diff --git a/desktop/onionshare/moat_dialog.py b/desktop/onionshare/moat_dialog.py index 84a52390..fd04ee9c 100644 --- a/desktop/onionshare/moat_dialog.py +++ b/desktop/onionshare/moat_dialog.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/settings_tab.py b/desktop/onionshare/settings_tab.py index cfa3261e..58843a0d 100644 --- a/desktop/onionshare/settings_tab.py +++ b/desktop/onionshare/settings_tab.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/strings.py b/desktop/onionshare/strings.py index 55f56788..f79195ea 100644 --- a/desktop/onionshare/strings.py +++ b/desktop/onionshare/strings.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/tab/__init__.py b/desktop/onionshare/tab/__init__.py index 62ec4a74..38c3abd5 100644 --- a/desktop/onionshare/tab/__init__.py +++ b/desktop/onionshare/tab/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/tab/mode/__init__.py b/desktop/onionshare/tab/mode/__init__.py index c9b5cad1..e50b9859 100644 --- a/desktop/onionshare/tab/mode/__init__.py +++ b/desktop/onionshare/tab/mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/tab/mode/chat_mode/__init__.py b/desktop/onionshare/tab/mode/chat_mode/__init__.py index 1081fe9d..af2cab81 100644 --- a/desktop/onionshare/tab/mode/chat_mode/__init__.py +++ b/desktop/onionshare/tab/mode/chat_mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/tab/mode/file_selection.py b/desktop/onionshare/tab/mode/file_selection.py index 1addba22..87d2e087 100644 --- a/desktop/onionshare/tab/mode/file_selection.py +++ b/desktop/onionshare/tab/mode/file_selection.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/tab/mode/history.py b/desktop/onionshare/tab/mode/history.py index 091905f7..d24e53c1 100644 --- a/desktop/onionshare/tab/mode/history.py +++ b/desktop/onionshare/tab/mode/history.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -481,6 +481,7 @@ class IndividualFileHistoryItem(HistoryItem): self.common.gui.css["history_individual_file_timestamp_label"] ) self.path_label = QtWidgets.QLabel(self.path) + self.path_label.setTextFormat(QtCore.Qt.PlainText) self.path_label.setStyleSheet(self.common.gui.css["history_default_label"]) self.status_code_label = QtWidgets.QLabel() diff --git a/desktop/onionshare/tab/mode/mode_settings_widget.py b/desktop/onionshare/tab/mode/mode_settings_widget.py index 0e80023e..7545c19e 100644 --- a/desktop/onionshare/tab/mode/mode_settings_widget.py +++ b/desktop/onionshare/tab/mode/mode_settings_widget.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/tab/mode/receive_mode/__init__.py b/desktop/onionshare/tab/mode/receive_mode/__init__.py index b2b2fc5a..55640c33 100644 --- a/desktop/onionshare/tab/mode/receive_mode/__init__.py +++ b/desktop/onionshare/tab/mode/receive_mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/tab/mode/share_mode/__init__.py b/desktop/onionshare/tab/mode/share_mode/__init__.py index ed7f6912..2617176d 100644 --- a/desktop/onionshare/tab/mode/share_mode/__init__.py +++ b/desktop/onionshare/tab/mode/share_mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/tab/mode/share_mode/threads.py b/desktop/onionshare/tab/mode/share_mode/threads.py index 839d30ea..6b1d96d6 100644 --- a/desktop/onionshare/tab/mode/share_mode/threads.py +++ b/desktop/onionshare/tab/mode/share_mode/threads.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/tab/mode/website_mode/__init__.py b/desktop/onionshare/tab/mode/website_mode/__init__.py index 0acbc1a2..a732c390 100644 --- a/desktop/onionshare/tab/mode/website_mode/__init__.py +++ b/desktop/onionshare/tab/mode/website_mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/tab/server_status.py b/desktop/onionshare/tab/server_status.py index 115acfd5..d355b43b 100644 --- a/desktop/onionshare/tab/server_status.py +++ b/desktop/onionshare/tab/server_status.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/tab/tab.py b/desktop/onionshare/tab/tab.py index b0aa25df..7f4e4073 100644 --- a/desktop/onionshare/tab/tab.py +++ b/desktop/onionshare/tab/tab.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/tab_widget.py b/desktop/onionshare/tab_widget.py index c43a9b9a..773dbdd5 100644 --- a/desktop/onionshare/tab_widget.py +++ b/desktop/onionshare/tab_widget.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/threads.py b/desktop/onionshare/threads.py index b02c6f21..7f445fc1 100644 --- a/desktop/onionshare/threads.py +++ b/desktop/onionshare/threads.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/tor_connection.py b/desktop/onionshare/tor_connection.py index 2cc599c4..30cd1814 100644 --- a/desktop/onionshare/tor_connection.py +++ b/desktop/onionshare/tor_connection.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -119,6 +119,7 @@ class TorConnectionDialog(QtWidgets.QProgressDialog): self.active = False # Close the dialog after connecting self.setValue(self.maximum()) + self.success.emit() def _canceled_connecting_to_tor(self): self.common.log("TorConnectionDialog", "_canceled_connecting_to_tor") diff --git a/desktop/onionshare/tor_settings_tab.py b/desktop/onionshare/tor_settings_tab.py index e28e5260..089cf1fe 100644 --- a/desktop/onionshare/tor_settings_tab.py +++ b/desktop/onionshare/tor_settings_tab.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/update_checker.py b/desktop/onionshare/update_checker.py index e9dbc060..71095356 100644 --- a/desktop/onionshare/update_checker.py +++ b/desktop/onionshare/update_checker.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/onionshare/widgets.py b/desktop/onionshare/widgets.py index 761df212..64a07703 100644 --- a/desktop/onionshare/widgets.py +++ b/desktop/onionshare/widgets.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/org.onionshare.OnionShare.appdata.xml b/desktop/org.onionshare.OnionShare.appdata.xml index 1bdac5f8..b911b382 100644 --- a/desktop/org.onionshare.OnionShare.appdata.xml +++ b/desktop/org.onionshare.OnionShare.appdata.xml @@ -24,6 +24,6 @@ <update_contact>micah@micahflee.com</update_contact> <content_rating type="oars-1.1" /> <releases> - <release type="development" date="2021-09-26" version="2.4" /> + <release type="development" date="2022-01-17" version="2.5" /> </releases> </component> diff --git a/desktop/pyproject.toml b/desktop/pyproject.toml index 7410c04b..71026f92 100644 --- a/desktop/pyproject.toml +++ b/desktop/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "onionshare" -version = "4.2.1" +version = "2.5" description = "OnionShare lets you securely and anonymously send and receive files. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service." authors = ["Micah Lee <micah@micahflee.com>"] license = "GPLv3+" diff --git a/desktop/scripts/bridges/__init__.py b/desktop/scripts/bridges/__init__.py index 1477d24d..e2495e38 100644 --- a/desktop/scripts/bridges/__init__.py +++ b/desktop/scripts/bridges/__init__.py @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/scripts/build-meek-client.py b/desktop/scripts/build-meek-client.py index 563e9a01..3d81d62f 100755 --- a/desktop/scripts/build-meek-client.py +++ b/desktop/scripts/build-meek-client.py @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/scripts/get-tor-linux.py b/desktop/scripts/get-tor-linux.py index a911713d..2882a591 100755 --- a/desktop/scripts/get-tor-linux.py +++ b/desktop/scripts/get-tor-linux.py @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,10 +35,10 @@ from bridges import UpdateTorBridges def main(): - tarball_url = "https://dist.torproject.org/torbrowser/11.0a10/tor-browser-linux64-11.0a10_en-US.tar.xz" - tarball_filename = "tor-browser-linux64-11.0a10_en-US.tar.xz" + tarball_url = "https://dist.torproject.org/torbrowser/11.0.4/tor-browser-linux64-11.0.4_en-US.tar.xz" + tarball_filename = "tor-browser-linux64-11.0.4_en-US.tar.xz" expected_tarball_sha256 = ( - "5d3e2ebc4fb6a10f44624359bc2a5a151a57e8402cbd8563d15f9b2524374f1f" + "05a5fd6d633ca84c33bbd3e2f8ffca2d2fa2105032a430b07d3c0cf062d9e15f" ) # Build paths diff --git a/desktop/scripts/get-tor-osx.py b/desktop/scripts/get-tor-osx.py index 2f2d2959..b973a90a 100755 --- a/desktop/scripts/get-tor-osx.py +++ b/desktop/scripts/get-tor-osx.py @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -36,10 +36,10 @@ from bridges import UpdateTorBridges def main(): - dmg_url = "https://dist.torproject.org/torbrowser/11.0a10/TorBrowser-11.0a10-osx64_en-US.dmg" - dmg_filename = "TorBrowser-11.0a10-osx64_en-US.dmg" + dmg_url = "https://dist.torproject.org/torbrowser/11.0.4/TorBrowser-11.0.4-osx64_en-US.dmg" + dmg_filename = "TorBrowser-11.0.4-osx64_en-US.dmg" expected_dmg_sha256 = ( - "c6823a28fd28205437564815f93011ff93b7972da2a8ce16919adfc65909e7b9" + "309a67c8a82ae266756d7cf5ea00e94d9242e59d55eaff97dcd6201da3c8449c" ) # Build paths diff --git a/desktop/scripts/get-tor-windows.py b/desktop/scripts/get-tor-windows.py index 4bd89ec4..513ff168 100644 --- a/desktop/scripts/get-tor-windows.py +++ b/desktop/scripts/get-tor-windows.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,10 +35,10 @@ from bridges import UpdateTorBridges def main(): - exe_url = "https://dist.torproject.org/torbrowser/11.0a10/torbrowser-install-11.0a10_en-US.exe" - exe_filename = "torbrowser-install-11.0a10_en-US.exe" + exe_url = "https://dist.torproject.org/torbrowser/11.0.4/torbrowser-install-11.0.4_en-US.exe" + exe_filename = "torbrowser-install-11.0.4_en-US.exe" expected_exe_sha256 = ( - "f567dd8368dea0a8d7bbf7c19ece7840f93d493e70662939b92f5058c8dc8d2d" + "c7073f58f49a225bcf7668a5630e94f5f5e96fb7bed095feebf3bf8417bd3d07" ) # Build paths root_path = os.path.dirname( diff --git a/desktop/setup-freeze.py b/desktop/setup-freeze.py index 6026a9cd..76ff6061 100644 --- a/desktop/setup-freeze.py +++ b/desktop/setup-freeze.py @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2022 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/tests/test_gui_receive.py b/desktop/tests/test_gui_receive.py index 8c1c44b3..3921c6a2 100644 --- a/desktop/tests/test_gui_receive.py +++ b/desktop/tests/test_gui_receive.py @@ -1,3 +1,4 @@ +import glob import pytest import os import requests @@ -35,17 +36,17 @@ class TestReceive(GuiBaseTest): now = datetime.now() for _ in range(10): date_dir = now.strftime("%Y-%m-%d") - if identical_files_at_once: - time_dir = now.strftime("%H%M%S-1") - else: - time_dir = now.strftime("%H%M%S") + time_dir = now.strftime("%H%M%S") receive_mode_dir = os.path.join( tab.settings.get("receive", "data_dir"), date_dir, time_dir ) - expected_filename = os.path.join(receive_mode_dir, expected_basename) - if os.path.exists(expected_filename): - exists = True - break + # The directories have microseconds in the name, so we need + # to use globbing against directory names containing the same + # second in order to try to find the file. + for path in glob.glob(receive_mode_dir + "*"): + if os.path.exists(os.path.join(path, expected_basename)): + exists = True + break now = now - timedelta(seconds=1) self.assertTrue(exists) @@ -83,17 +84,18 @@ class TestReceive(GuiBaseTest): for _ in range(10): date_dir = now.strftime("%Y-%m-%d") time_dir = now.strftime("%H%M%S") - expected_filename = os.path.join( + expected_estimated_filename = os.path.join( tab.settings.get("receive", "data_dir"), date_dir, - f"{time_dir}-message.txt", + f"{time_dir}*-message.txt", ) - if os.path.exists(expected_filename): - with open(expected_filename) as f: - assert f.read() == message + for path in glob.glob(expected_estimated_filename): + if os.path.exists(path): + with open(path) as f: + assert f.read() == message - exists = True - break + exists = True + break now = now - timedelta(seconds=1) self.assertTrue(exists) |