diff --git a/newsfragments/3303.minor b/newsfragments/3303.minor new file mode 100644 index 000000000..e69de29bb diff --git a/nix/eliot.nix b/nix/eliot.nix index df41b3a61..c5975e990 100644 --- a/nix/eliot.nix +++ b/nix/eliot.nix @@ -12,15 +12,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "boltons >= 19.0.1" boltons - # depends on eliot.prettyprint._main which we don't have here. - rm eliot/tests/test_prettyprint.py - - # Fails intermittently. - substituteInPlace eliot/tests/test_validation.py \ - --replace "def test_omitLoggerFromActionType" "def xtest_omitLoggerFromActionType" \ - --replace "def test_logCallsDefaultLoggerWrite" "def xtest_logCallsDefaultLoggerWrite" ''; + # A seemingly random subset of the test suite fails intermittently. After + # Tahoe-LAFS is ported to Python 3 we can update to a newer Eliot and, if + # the test suite continues to fail, maybe it will be more likely that we can + # have upstream fix it for us. + doCheck = false; + checkInputs = [ testtools pytest hypothesis ]; propagatedBuildInputs = [ zope_interface pyrsistent boltons ];