From 9e82df4fa72d613fe2dc6ccd6b23bfb1102d561d Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Sun, 19 Jul 2020 09:19:19 -0400 Subject: [PATCH] Use skipif decorator to omit Tor integration test setup on Windows --- integration/conftest.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/integration/conftest.py b/integration/conftest.py index 35e550416..bb104b464 100644 --- a/integration/conftest.py +++ b/integration/conftest.py @@ -358,11 +358,10 @@ def bob(reactor, temp_dir, introducer_furl, flog_gatherer, storage_nodes, reques @pytest.fixture(scope='session') +@pytest.mark.skipif(sys.platform.startswith('win'), + 'Tor tests are unstable on Windows') def chutney(reactor, temp_dir): - if sys.platform.startswith('win'): - pytest.skip('Tor tests are unstable on Windows') - chutney_dir = join(temp_dir, 'chutney') mkdir(chutney_dir) @@ -392,11 +391,10 @@ def chutney(reactor, temp_dir): @pytest.fixture(scope='session') +@pytest.mark.skipif(sys.platform.startswith('win'), + reason='Tor tests are unstable on Windows') def tor_network(reactor, temp_dir, chutney, request): - if sys.platform.startswith('win'): - pytest.skip('Tor tests are unstable on Windows') - # this is the actual "chutney" script at the root of a chutney checkout chutney_dir = chutney chut = join(chutney_dir, 'chutney')