diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ded8f418..7cd97dcca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,6 +72,7 @@ jobs: matrix: os: - macos-latest + - windows-latest python-version: - 2.7 diff --git a/integration/conftest.py b/integration/conftest.py index 9c4c7433c..04e3dcb52 100644 --- a/integration/conftest.py +++ b/integration/conftest.py @@ -358,7 +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): + chutney_dir = join(temp_dir, 'chutney') mkdir(chutney_dir) @@ -406,7 +409,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): + # 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..28360207a 100644 --- a/integration/test_tor.py +++ b/integration/test_tor.py @@ -10,12 +10,21 @@ 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") +# XXX: Integration tests that involve Tor do not run reliably on +# Windows. They are skipped for now, in order to reduce CI noise. +# +# https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3347 +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) diff --git a/newsfragments/3320.minor b/newsfragments/3320.minor new file mode 100644 index 000000000..e69de29bb