From 7d93ae9213aae1e4957bf580152a91ead586a511 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Mon, 22 Jun 2020 20:16:19 -0400 Subject: [PATCH] Skip Tor tests on Windows --- integration/conftest.py | 8 ++++++++ integration/test_tor.py | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/integration/conftest.py b/integration/conftest.py index 5395d7c5f..35e550416 100644 --- a/integration/conftest.py +++ b/integration/conftest.py @@ -359,6 +359,10 @@ def bob(reactor, temp_dir, introducer_furl, flog_gatherer, storage_nodes, reques @pytest.fixture(scope='session') 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) @@ -389,6 +393,10 @@ def chutney(reactor, temp_dir): @pytest.fixture(scope='session') 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') diff --git a/integration/test_tor.py b/integration/test_tor.py index 633def8de..cec88a483 100644 --- a/integration/test_tor.py +++ b/integration/test_tor.py @@ -10,12 +10,17 @@ from six.moves import StringIO from twisted.internet.protocol import ProcessProtocol from twisted.internet.error import ProcessExitedAlready, ProcessDone from twisted.internet.defer import inlineCallbacks, Deferred + +import pytest import pytest_twisted import util # see "conftest.py" for the fixtures (e.g. "tor_network") +if sys.platform.startswith('win'): + pytest.skip('Skipping Tor tests on Windows', allow_module_level=True) + @pytest_twisted.inlineCallbacks def test_onion_service_storage(reactor, request, temp_dir, flog_gatherer, tor_network, tor_introducer_furl): yield _create_anonymous_node(reactor, 'carol', 8008, request, temp_dir, flog_gatherer, tor_network, tor_introducer_furl)