respect TERMINUS_* vars in testing environment

pantheon-systems · Feb 14, 2024 · aafed69 · aafed69
1 parent c4a9310
commit aafed69
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/tests/Functional/TerminusTestBase.php b/tests/Functional/TerminusTestBase.php
@@ -38,8 +38,21 @@ protected static function callTerminus(
         string $command,
         ?string $pipeInput = null
     ): array {
-        $terminusHost = isset($_ENV['TERMINUS_HOST']) ? "TERMINUS_HOST=" . $_ENV['TERMINUS_HOST'] : "";
-        $procCommand = sprintf('%s %s %s', $terminusHost, TERMINUS_BIN_FILE, $command);
+        $preamble = '';
+        foreach (
+            [
+                'TERMINUS_HOST',
+                'TERMINUS_PORT',
+                'TERMINUS_VERIFY_HOST_CERT',
+                'TERMINUS_CACHE_DIR',
+                'PANTHEON_CERT'
+            ] as $envVar
+        ) {
+            if (false !== getenv($envVar)) {
+                $preamble .= sprintf('%s=%s ', $envVar, getenv($envVar));
+            }
+        }
+        $procCommand = sprintf('%s %s %s', $preamble, TERMINUS_BIN_FILE, $command);
         if (null !== $pipeInput) {
             $procCommand = sprintf('%s | %s', $pipeInput, $procCommand);
         }
@@ -212,7 +225,7 @@ protected function assertTerminusCommandSucceedsInAttempts(
         int $attempts = 3
     ): void {
         $this->assertTerminusCommandResultEqualsInAttempts(
-            fn () => static::callTerminus(sprintf('%s --yes', $command))[1],
+            fn() => static::callTerminus(sprintf('%s --yes', $command))[1],
             0,
             $attempts
         );