From b0e92fb49d1c6f5c18e36f91c18d3ed981b47ae9 Mon Sep 17 00:00:00 2001
From: dustinlharrison <dustinlharrison@gmail.com>
Date: Thu, 26 Sep 2019 14:07:26 -0700
Subject: [PATCH] Fixed #30806 -- Prevented tox tests hanging on macOS.

MacOS users may need to set OBJC_DISABLE_INITIALIZE_FORK_SAFETY=TRUE
(#27086) to prevent tests from hanging.  If set, also pass the environment
variable to `tox`.
---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 5e2f54fd78..e0823dd9ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,8 @@ basepython = python3
 
 [testenv]
 usedevelop = true
-passenv = DJANGO_SETTINGS_MODULE PYTHONPATH HOME DISPLAY
+# OBJC_DISABLE_INITIALIZE_FORK_SAFETY fixes hung tests for MacOS users. (#30806)
+passenv = DJANGO_SETTINGS_MODULE PYTHONPATH HOME DISPLAY OBJC_DISABLE_INITIALIZE_FORK_SAFETY
 setenv =
     PYTHONDONTWRITEBYTECODE=1
 deps =