From 1cc5200d3c8ec587bb75668fcaa445dcadb92b81 Mon Sep 17 00:00:00 2001
From: Raimo Radczewski <raimo@craftswerk.io>
Date: Fri, 24 May 2024 23:26:47 +0200
Subject: [PATCH] Shorter merging suite-level an test-level environment

---
 src/lib/Test/Smoke/Plan.hs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/lib/Test/Smoke/Plan.hs b/src/lib/Test/Smoke/Plan.hs
index b4f5a8b..bc9d5db 100644
--- a/src/lib/Test/Smoke/Plan.hs
+++ b/src/lib/Test/Smoke/Plan.hs
@@ -80,11 +80,6 @@ readTest location fallbackWorkingDirectory fallbackShell fallbackCommand fallbac
   stdErr <- readStdErr location test
   files <- readFiles location test
   let revert = Vector.map (location </>) (testRevert test)
-  let environment = case (testEnvironment test, fallbackEnvironment) of
-        (Nothing, Nothing) -> Nothing
-        (Just env, Nothing) -> Just env
-        (Nothing, Just fallbackEnv) -> Just fallbackEnv
-        (Just env, Just fallbackEnv) -> Just (env <> fallbackEnv)
   pure $
     TestPlan
       { planTest = test,
@@ -92,7 +87,7 @@ readTest location fallbackWorkingDirectory fallbackShell fallbackCommand fallbac
         planShell = fallbackShell,
         planExecutable = executable,
         planArgs = args,
-        planEnvironment = environment,
+        planEnvironment = testEnvironment test <> fallbackEnvironment,
         planStdIn = stdIn,
         planStatus = status,
         planStdOut = stdOut,