From 50792886e68899555a10269f64dfe0ae8cd3feb0 Mon Sep 17 00:00:00 2001
From: Ian Rose <ian@coiled.io>
Date: Thu, 2 Jun 2022 17:07:50 -0700
Subject: [PATCH] Try disabling HDF5 locking (#9154)

---
 .github/workflows/tests.yml    | 1 +
 dask/dataframe/io/hdf.py       | 2 +-
 dask/tests/test_distributed.py | 5 -----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7128e4b2609..79417e600b5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -29,6 +29,7 @@ jobs:
       PYTHON_VERSION: ${{ matrix.python-version }}
       PARALLEL: "true"
       COVERAGE: "true"
+      HDF5_USE_FILE_LOCKING: "FALSE"
 
     steps:
       - name: Checkout source
diff --git a/dask/dataframe/io/hdf.py b/dask/dataframe/io/hdf.py
index 2058b789068..661939f00b1 100644
--- a/dask/dataframe/io/hdf.py
+++ b/dask/dataframe/io/hdf.py
@@ -76,7 +76,7 @@ def to_hdf(
     compute : bool
         Whether or not to execute immediately.  If False then this returns a
         ``dask.Delayed`` value.
-    lock : Lock, optional
+    lock : bool, Lock, optional
         Lock to use to prevent concurrency issues.  By default a
         ``threading.Lock``, ``multiprocessing.Lock`` or ``SerializableLock``
         will be used depending on your scheduler if a lock is required. See
diff --git a/dask/tests/test_distributed.py b/dask/tests/test_distributed.py
index f215c2b9598..90555f72343 100644
--- a/dask/tests/test_distributed.py
+++ b/dask/tests/test_distributed.py
@@ -375,11 +375,6 @@ def test_blockwise_dataframe_io(c, tmpdir, io, fuse, from_futures):
     pd = pytest.importorskip("pandas")
     dd = pytest.importorskip("dask.dataframe")
 
-    # TODO: this configuration is flaky on osx in CI
-    # See https://github.com/dask/dask/issues/8816
-    if from_futures and sys.platform == "darwin":
-        pytest.xfail("This test sometimes fails on osx in CI")
-
     df = pd.DataFrame({"x": [1, 2, 3] * 5, "y": range(15)})
 
     if from_futures: