diff options
| author | Micah Lee <micah@micahflee.com> | 2019-05-06 18:06:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-06 18:06:14 -0700 |
| commit | bbf6c02da645fcd4fc50db18dd341178ad4fa2e6 (patch) | |
| tree | c1e2757c56f517e051c9f905f8a7a12e1b8d66ae /tests/local_onionshare_share_mode_timer_test.py | |
| parent | a8201593ec0bfe7596ef530e80aa30e5172ef71d (diff) | |
| parent | 9e9c29b189cb91ea495a85ed749730395926e07b (diff) | |
| download | onionshare-bbf6c02da645fcd4fc50db18dd341178ad4fa2e6.tar.gz onionshare-bbf6c02da645fcd4fc50db18dd341178ad4fa2e6.zip | |
Merge pull request #980 from micahflee/developv2.1
Version 2.1
Diffstat (limited to 'tests/local_onionshare_share_mode_timer_test.py')
| -rw-r--r-- | tests/local_onionshare_share_mode_timer_test.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/local_onionshare_share_mode_timer_test.py b/tests/local_onionshare_share_mode_timer_test.py index e30ce4ec..0526be08 100644 --- a/tests/local_onionshare_share_mode_timer_test.py +++ b/tests/local_onionshare_share_mode_timer_test.py @@ -9,7 +9,7 @@ class LocalShareModeTimerTest(unittest.TestCase, GuiShareTest): def setUpClass(cls): test_settings = { "public_mode": False, - "shutdown_timeout": True, + "autostop_timer": True, } cls.gui = GuiShareTest.set_up(test_settings) @@ -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) |