From f6c64f8d19a1eefda359850aee62a70a6ba8f66c Mon Sep 17 00:00:00 2001
From: Brian Gunnarson <brianfunnarson14@gmail.com>
Date: Tue, 7 Nov 2023 11:01:19 -0800
Subject: [PATCH] add fix for merlin server startup

---
 tests/conftest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index a496175eb..88932c5db 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -123,7 +123,8 @@ def redis_server(merlin_server_dir: str, redis_pass: str) -> str:  # pylint: dis
     """
     # Start the local redis server
     try:
-        subprocess.run("merlin server start", shell=True, capture_output=True, text=True, timeout=5)
+        # Need to set LC_ALL='C' before starting the server or else redis causes a failure
+        subprocess.run("export LC_ALL='C'; merlin server start", shell=True, capture_output=True, text=True, timeout=5)
     except subprocess.TimeoutExpired:
         pass