From 436dd3052d8137689802705e5e301cd9aa60ae92 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Sun, 24 Feb 2019 18:11:13 -0800 Subject: Add try/except block when stubbing flash's show_server_banner, in order to support older versions of flask --- onionshare/web/web.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/onionshare/web/web.py b/onionshare/web/web.py index 66ba5b24..26694e59 100644 --- a/onionshare/web/web.py +++ b/onionshare/web/web.py @@ -22,7 +22,10 @@ from .receive_mode import ReceiveModeWeb, ReceiveModeWSGIMiddleware, ReceiveMode def stubbed_show_server_banner(env, debug, app_import_path, eager_loading): pass -flask.cli.show_server_banner = stubbed_show_server_banner +try: + flask.cli.show_server_banner = stubbed_show_server_banner +except: + pass class Web(object): -- cgit v1.2.3-54-g00ecf From 3845c5b3cf3724f484ead2f2022394a70d282986 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Thu, 18 Apr 2019 20:38:44 -0700 Subject: Skip GUI and tor tests if pytest is older than 2.9, to allow tests to run in old ubuntu --- tests/local_onionshare_404_public_mode_skips_ratelimit_test.py | 1 + tests/local_onionshare_404_triggers_ratelimit_test.py | 1 + tests/local_onionshare_quitting_during_share_prompts_warning_test.py | 1 + tests/local_onionshare_receive_mode_timer_test.py | 1 + tests/local_onionshare_receive_mode_upload_non_writable_dir_test.py | 1 + ...l_onionshare_receive_mode_upload_public_mode_non_writable_dir_test.py | 1 + tests/local_onionshare_receive_mode_upload_public_mode_test.py | 1 + tests/local_onionshare_receive_mode_upload_test.py | 1 + tests/local_onionshare_settings_dialog_legacy_tor_test.py | 1 + tests/local_onionshare_settings_dialog_no_tor_test.py | 1 + tests/local_onionshare_settings_dialog_v3_tor_test.py | 1 + ...l_onionshare_share_mode_autostart_and_autostop_timer_mismatch_test.py | 1 + tests/local_onionshare_share_mode_autostart_timer_test.py | 1 + tests/local_onionshare_share_mode_autostart_timer_too_short_test.py | 1 + tests/local_onionshare_share_mode_cancel_share_test.py | 1 + tests/local_onionshare_share_mode_download_public_mode_test.py | 1 + tests/local_onionshare_share_mode_download_stay_open_test.py | 1 + tests/local_onionshare_share_mode_download_test.py | 1 + tests/local_onionshare_share_mode_large_download_test.py | 1 + tests/local_onionshare_share_mode_slug_persistent_test.py | 1 + tests/local_onionshare_share_mode_timer_test.py | 1 + tests/local_onionshare_share_mode_timer_too_short_test.py | 1 + tests/local_onionshare_share_mode_unreadable_file_test.py | 1 + tests/onionshare_790_cancel_on_second_share_test.py | 1 + tests/onionshare_receive_mode_upload_public_mode_test.py | 1 + tests/onionshare_receive_mode_upload_test.py | 1 + tests/onionshare_share_mode_cancel_share_test.py | 1 + tests/onionshare_share_mode_download_public_mode_test.py | 1 + tests/onionshare_share_mode_download_stay_open_test.py | 1 + tests/onionshare_share_mode_download_test.py | 1 + tests/onionshare_share_mode_persistent_test.py | 1 + tests/onionshare_share_mode_stealth_test.py | 1 + tests/onionshare_share_mode_timer_test.py | 1 + tests/onionshare_share_mode_tor_connection_killed_test.py | 1 + tests/onionshare_share_mode_v2_onion_test.py | 1 + 35 files changed, 35 insertions(+) diff --git a/tests/local_onionshare_404_public_mode_skips_ratelimit_test.py b/tests/local_onionshare_404_public_mode_skips_ratelimit_test.py index ebb524c2..4fad5532 100644 --- a/tests/local_onionshare_404_public_mode_skips_ratelimit_test.py +++ b/tests/local_onionshare_404_public_mode_skips_ratelimit_test.py @@ -18,6 +18,7 @@ class Local404PublicModeRateLimitTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_tests(True, True) diff --git a/tests/local_onionshare_404_triggers_ratelimit_test.py b/tests/local_onionshare_404_triggers_ratelimit_test.py index 8ed0777a..49be0f5b 100644 --- a/tests/local_onionshare_404_triggers_ratelimit_test.py +++ b/tests/local_onionshare_404_triggers_ratelimit_test.py @@ -17,6 +17,7 @@ class Local404RateLimitTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_tests(False, True) diff --git a/tests/local_onionshare_quitting_during_share_prompts_warning_test.py b/tests/local_onionshare_quitting_during_share_prompts_warning_test.py index e57167c8..e43c88ba 100644 --- a/tests/local_onionshare_quitting_during_share_prompts_warning_test.py +++ b/tests/local_onionshare_quitting_during_share_prompts_warning_test.py @@ -18,6 +18,7 @@ class LocalQuittingDuringSharePromptsWarningTest(unittest.TestCase, GuiShareTest GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_tests(False, True) diff --git a/tests/local_onionshare_receive_mode_timer_test.py b/tests/local_onionshare_receive_mode_timer_test.py index 6687d154..4cde86c1 100644 --- a/tests/local_onionshare_receive_mode_timer_test.py +++ b/tests/local_onionshare_receive_mode_timer_test.py @@ -18,6 +18,7 @@ class LocalReceiveModeTimerTest(unittest.TestCase, GuiReceiveTest): GuiReceiveTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_receive_mode_timer_tests(False) diff --git a/tests/local_onionshare_receive_mode_upload_non_writable_dir_test.py b/tests/local_onionshare_receive_mode_upload_non_writable_dir_test.py index a1dcd679..5737bae3 100644 --- a/tests/local_onionshare_receive_mode_upload_non_writable_dir_test.py +++ b/tests/local_onionshare_receive_mode_upload_non_writable_dir_test.py @@ -17,6 +17,7 @@ class LocalReceiveModeUnwritableTest(unittest.TestCase, GuiReceiveTest): GuiReceiveTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_receive_mode_unwritable_dir_tests(False, True) diff --git a/tests/local_onionshare_receive_mode_upload_public_mode_non_writable_dir_test.py b/tests/local_onionshare_receive_mode_upload_public_mode_non_writable_dir_test.py index 529e0c87..e6024352 100644 --- a/tests/local_onionshare_receive_mode_upload_public_mode_non_writable_dir_test.py +++ b/tests/local_onionshare_receive_mode_upload_public_mode_non_writable_dir_test.py @@ -18,6 +18,7 @@ class LocalReceivePublicModeUnwritableTest(unittest.TestCase, GuiReceiveTest): GuiReceiveTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_receive_mode_unwritable_dir_tests(True, True) diff --git a/tests/local_onionshare_receive_mode_upload_public_mode_test.py b/tests/local_onionshare_receive_mode_upload_public_mode_test.py index f8bd38bd..885ae4fe 100644 --- a/tests/local_onionshare_receive_mode_upload_public_mode_test.py +++ b/tests/local_onionshare_receive_mode_upload_public_mode_test.py @@ -18,6 +18,7 @@ class LocalReceiveModePublicModeTest(unittest.TestCase, GuiReceiveTest): GuiReceiveTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_receive_mode_tests(True, True) diff --git a/tests/local_onionshare_receive_mode_upload_test.py b/tests/local_onionshare_receive_mode_upload_test.py index 362e3b85..3d23730c 100644 --- a/tests/local_onionshare_receive_mode_upload_test.py +++ b/tests/local_onionshare_receive_mode_upload_test.py @@ -17,6 +17,7 @@ class LocalReceiveModeTest(unittest.TestCase, GuiReceiveTest): GuiReceiveTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_receive_mode_tests(False, True) diff --git a/tests/local_onionshare_settings_dialog_legacy_tor_test.py b/tests/local_onionshare_settings_dialog_legacy_tor_test.py index f32023fe..54653c1b 100644 --- a/tests/local_onionshare_settings_dialog_legacy_tor_test.py +++ b/tests/local_onionshare_settings_dialog_legacy_tor_test.py @@ -16,6 +16,7 @@ class SettingsGuiTest(unittest.TestCase, SettingsGuiBaseTest): SettingsGuiBaseTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui_legacy_tor(self): self.gui.onion = OnionStub(True, False) self.gui.reload_settings() diff --git a/tests/local_onionshare_settings_dialog_no_tor_test.py b/tests/local_onionshare_settings_dialog_no_tor_test.py index b34cbff3..06e3cc9e 100644 --- a/tests/local_onionshare_settings_dialog_no_tor_test.py +++ b/tests/local_onionshare_settings_dialog_no_tor_test.py @@ -16,6 +16,7 @@ class SettingsGuiTest(unittest.TestCase, SettingsGuiBaseTest): SettingsGuiBaseTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui_no_tor(self): self.gui.onion = OnionStub(False, False) self.gui.reload_settings() diff --git a/tests/local_onionshare_settings_dialog_v3_tor_test.py b/tests/local_onionshare_settings_dialog_v3_tor_test.py index 1dd17c0f..88a0438e 100644 --- a/tests/local_onionshare_settings_dialog_v3_tor_test.py +++ b/tests/local_onionshare_settings_dialog_v3_tor_test.py @@ -16,6 +16,7 @@ class SettingsGuiTest(unittest.TestCase, SettingsGuiBaseTest): SettingsGuiBaseTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui_v3_tor(self): self.gui.onion = OnionStub(True, True) self.gui.reload_settings() diff --git a/tests/local_onionshare_share_mode_autostart_and_autostop_timer_mismatch_test.py b/tests/local_onionshare_share_mode_autostart_and_autostop_timer_mismatch_test.py index 70a9ecb3..0bb3bfa3 100644 --- a/tests/local_onionshare_share_mode_autostart_and_autostop_timer_mismatch_test.py +++ b/tests/local_onionshare_share_mode_autostart_and_autostop_timer_mismatch_test.py @@ -19,6 +19,7 @@ class LocalShareModeAutoStartTimerTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_autostop_autostart_mismatch_tests(False) diff --git a/tests/local_onionshare_share_mode_autostart_timer_test.py b/tests/local_onionshare_share_mode_autostart_timer_test.py index 9da75f1d..4fd5f649 100644 --- a/tests/local_onionshare_share_mode_autostart_timer_test.py +++ b/tests/local_onionshare_share_mode_autostart_timer_test.py @@ -18,6 +18,7 @@ class LocalShareModeAutoStartTimerTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_autostart_timer_tests(False) diff --git a/tests/local_onionshare_share_mode_autostart_timer_too_short_test.py b/tests/local_onionshare_share_mode_autostart_timer_too_short_test.py index 92bbe12d..d8e82aed 100644 --- a/tests/local_onionshare_share_mode_autostart_timer_too_short_test.py +++ b/tests/local_onionshare_share_mode_autostart_timer_too_short_test.py @@ -19,6 +19,7 @@ class LocalShareModeAutoStartTimerTooShortTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_setup_tests() diff --git a/tests/local_onionshare_share_mode_cancel_share_test.py b/tests/local_onionshare_share_mode_cancel_share_test.py index ba52721d..5b526999 100644 --- a/tests/local_onionshare_share_mode_cancel_share_test.py +++ b/tests/local_onionshare_share_mode_cancel_share_test.py @@ -17,6 +17,7 @@ class LocalShareModeCancelTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_setup_tests() diff --git a/tests/local_onionshare_share_mode_download_public_mode_test.py b/tests/local_onionshare_share_mode_download_public_mode_test.py index f9a9dc4c..b7ff336c 100644 --- a/tests/local_onionshare_share_mode_download_public_mode_test.py +++ b/tests/local_onionshare_share_mode_download_public_mode_test.py @@ -17,6 +17,7 @@ class LocalShareModePublicModeTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_tests(True, False) diff --git a/tests/local_onionshare_share_mode_download_stay_open_test.py b/tests/local_onionshare_share_mode_download_stay_open_test.py index 65304924..50d82326 100644 --- a/tests/local_onionshare_share_mode_download_stay_open_test.py +++ b/tests/local_onionshare_share_mode_download_stay_open_test.py @@ -17,6 +17,7 @@ class LocalShareModeStayOpenTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_tests(False, True) diff --git a/tests/local_onionshare_share_mode_download_test.py b/tests/local_onionshare_share_mode_download_test.py index ea16683e..387d63c1 100644 --- a/tests/local_onionshare_share_mode_download_test.py +++ b/tests/local_onionshare_share_mode_download_test.py @@ -16,6 +16,7 @@ class LocalShareModeTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_tests(False, False) diff --git a/tests/local_onionshare_share_mode_large_download_test.py b/tests/local_onionshare_share_mode_large_download_test.py index 7d0595a2..5717a2d8 100644 --- a/tests/local_onionshare_share_mode_large_download_test.py +++ b/tests/local_onionshare_share_mode_large_download_test.py @@ -16,6 +16,7 @@ class LocalShareModeLargeDownloadTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_large_file_tests(False, True) diff --git a/tests/local_onionshare_share_mode_slug_persistent_test.py b/tests/local_onionshare_share_mode_slug_persistent_test.py index 7254f3ff..58e1cfeb 100644 --- a/tests/local_onionshare_share_mode_slug_persistent_test.py +++ b/tests/local_onionshare_share_mode_slug_persistent_test.py @@ -20,6 +20,7 @@ class LocalShareModePersistentSlugTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_persistent_tests(False, True) diff --git a/tests/local_onionshare_share_mode_timer_test.py b/tests/local_onionshare_share_mode_timer_test.py index ee47a07d..0526be08 100644 --- a/tests/local_onionshare_share_mode_timer_test.py +++ b/tests/local_onionshare_share_mode_timer_test.py @@ -18,6 +18,7 @@ class LocalShareModeTimerTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_timer_tests(False) diff --git a/tests/local_onionshare_share_mode_timer_too_short_test.py b/tests/local_onionshare_share_mode_timer_too_short_test.py index fce895d3..09b82af3 100644 --- a/tests/local_onionshare_share_mode_timer_too_short_test.py +++ b/tests/local_onionshare_share_mode_timer_too_short_test.py @@ -19,6 +19,7 @@ class LocalShareModeTimerTooShortTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_setup_tests() diff --git a/tests/local_onionshare_share_mode_unreadable_file_test.py b/tests/local_onionshare_share_mode_unreadable_file_test.py index c74d7a0a..8b5dd4e7 100644 --- a/tests/local_onionshare_share_mode_unreadable_file_test.py +++ b/tests/local_onionshare_share_mode_unreadable_file_test.py @@ -16,6 +16,7 @@ class LocalShareModeUnReadableFileTest(unittest.TestCase, GuiShareTest): GuiShareTest.tear_down() @pytest.mark.gui + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_unreadable_file_tests() diff --git a/tests/onionshare_790_cancel_on_second_share_test.py b/tests/onionshare_790_cancel_on_second_share_test.py index 4b7673bb..f970b8af 100644 --- a/tests/onionshare_790_cancel_on_second_share_test.py +++ b/tests/onionshare_790_cancel_on_second_share_test.py @@ -19,6 +19,7 @@ class ShareModeCancelSecondShareTest(unittest.TestCase, TorGuiShareTest): @pytest.mark.gui @pytest.mark.tor + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_tests(False, False) diff --git a/tests/onionshare_receive_mode_upload_public_mode_test.py b/tests/onionshare_receive_mode_upload_public_mode_test.py index 3c733f0a..c2611ad5 100644 --- a/tests/onionshare_receive_mode_upload_public_mode_test.py +++ b/tests/onionshare_receive_mode_upload_public_mode_test.py @@ -19,6 +19,7 @@ class ReceiveModeTest(unittest.TestCase, TorGuiReceiveTest): @pytest.mark.gui @pytest.mark.tor + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_receive_mode_tests(True, True) diff --git a/tests/onionshare_receive_mode_upload_test.py b/tests/onionshare_receive_mode_upload_test.py index 493cacc7..a1935562 100644 --- a/tests/onionshare_receive_mode_upload_test.py +++ b/tests/onionshare_receive_mode_upload_test.py @@ -18,6 +18,7 @@ class ReceiveModeTest(unittest.TestCase, TorGuiReceiveTest): @pytest.mark.gui @pytest.mark.tor + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_receive_mode_tests(False, True) diff --git a/tests/onionshare_share_mode_cancel_share_test.py b/tests/onionshare_share_mode_cancel_share_test.py index 3fc4f592..2a248bae 100644 --- a/tests/onionshare_share_mode_cancel_share_test.py +++ b/tests/onionshare_share_mode_cancel_share_test.py @@ -18,6 +18,7 @@ class ShareModeCancelTest(unittest.TestCase, TorGuiShareTest): @pytest.mark.gui @pytest.mark.tor + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_setup_tests() diff --git a/tests/onionshare_share_mode_download_public_mode_test.py b/tests/onionshare_share_mode_download_public_mode_test.py index eb9adb1e..93c23978 100644 --- a/tests/onionshare_share_mode_download_public_mode_test.py +++ b/tests/onionshare_share_mode_download_public_mode_test.py @@ -18,6 +18,7 @@ class ShareModePublicModeTest(unittest.TestCase, TorGuiShareTest): @pytest.mark.gui @pytest.mark.tor + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_tests(True, False) diff --git a/tests/onionshare_share_mode_download_stay_open_test.py b/tests/onionshare_share_mode_download_stay_open_test.py index 93a41f1f..3fcebc63 100644 --- a/tests/onionshare_share_mode_download_stay_open_test.py +++ b/tests/onionshare_share_mode_download_stay_open_test.py @@ -18,6 +18,7 @@ class ShareModeStayOpenTest(unittest.TestCase, TorGuiShareTest): @pytest.mark.gui @pytest.mark.tor + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_tests(False, True) diff --git a/tests/onionshare_share_mode_download_test.py b/tests/onionshare_share_mode_download_test.py index ac3dee76..65f68df6 100644 --- a/tests/onionshare_share_mode_download_test.py +++ b/tests/onionshare_share_mode_download_test.py @@ -17,6 +17,7 @@ class ShareModeTest(unittest.TestCase, TorGuiShareTest): @pytest.mark.gui @pytest.mark.tor + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_tests(False, False) diff --git a/tests/onionshare_share_mode_persistent_test.py b/tests/onionshare_share_mode_persistent_test.py index 13588a68..d0fb5b22 100644 --- a/tests/onionshare_share_mode_persistent_test.py +++ b/tests/onionshare_share_mode_persistent_test.py @@ -22,6 +22,7 @@ class ShareModePersistentSlugTest(unittest.TestCase, TorGuiShareTest): @pytest.mark.gui @pytest.mark.tor + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_persistent_tests(False, True) diff --git a/tests/onionshare_share_mode_stealth_test.py b/tests/onionshare_share_mode_stealth_test.py index bb9114a6..ded0b7a8 100644 --- a/tests/onionshare_share_mode_stealth_test.py +++ b/tests/onionshare_share_mode_stealth_test.py @@ -19,6 +19,7 @@ class ShareModeStealthTest(unittest.TestCase, TorGuiShareTest): @pytest.mark.gui @pytest.mark.tor + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_setup_tests() diff --git a/tests/onionshare_share_mode_timer_test.py b/tests/onionshare_share_mode_timer_test.py index 65ef1e38..1ae2b0fa 100644 --- a/tests/onionshare_share_mode_timer_test.py +++ b/tests/onionshare_share_mode_timer_test.py @@ -19,6 +19,7 @@ class ShareModeTimerTest(unittest.TestCase, TorGuiShareTest): @pytest.mark.gui @pytest.mark.tor + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_timer_tests(False) diff --git a/tests/onionshare_share_mode_tor_connection_killed_test.py b/tests/onionshare_share_mode_tor_connection_killed_test.py index cf48df3d..7362a170 100644 --- a/tests/onionshare_share_mode_tor_connection_killed_test.py +++ b/tests/onionshare_share_mode_tor_connection_killed_test.py @@ -13,6 +13,7 @@ class ShareModeTorConnectionKilledTest(unittest.TestCase, TorGuiShareTest): @pytest.mark.gui @pytest.mark.tor + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_setup_tests() diff --git a/tests/onionshare_share_mode_v2_onion_test.py b/tests/onionshare_share_mode_v2_onion_test.py index 18f5f058..29c97491 100644 --- a/tests/onionshare_share_mode_v2_onion_test.py +++ b/tests/onionshare_share_mode_v2_onion_test.py @@ -18,6 +18,7 @@ class ShareModeV2OnionTest(unittest.TestCase, TorGuiShareTest): @pytest.mark.gui @pytest.mark.tor + @pytest.mark.skipif(pytest.__version__ < '2.9', reason="requires newer pytest") def test_gui(self): self.run_all_common_setup_tests() self.run_all_share_mode_tests(False, False) -- cgit v1.2.3-54-g00ecf