From 783792597b12b708a4a90a42ca8687af4199fcf1 Mon Sep 17 00:00:00 2001
From: Alexander Streed <desertaxle@users.noreply.github.com>
Date: Wed, 22 Nov 2023 11:53:16 -0600
Subject: [PATCH] Flaky test investigation (#11229)

---
 requirements-dev.txt     | 2 +-
 tests/fixtures/client.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 58df955be44a..1781b4f60df8 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -25,7 +25,7 @@ pytest-benchmark
 pytest-env
 pytest-flakefinder
 pytest-timeout
-pytest-xdist
+pytest-xdist < 3.4.0 # 3.5.0 introduces some flakiness. Need to investigate and resolve.
 pytkdocs >= 0.14.2
 pyyaml
 requests
diff --git a/tests/fixtures/client.py b/tests/fixtures/client.py
index ebb340df04fe..48c302ad3297 100644
--- a/tests/fixtures/client.py
+++ b/tests/fixtures/client.py
@@ -40,7 +40,7 @@ def client_test_flow_dict_parameter(dict_param: Dict[int, str]):
     return client_test_flow_dict_parameter
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture(scope="session")
 def test_block():
     class x(Block):
         _block_type_slug = "x-fixture"