From e031e361208a96ba4fb62c3c4e1dbcd386f55400 Mon Sep 17 00:00:00 2001
From: Ludovico Magnocavallo <ludomagno@google.com>
Date: Tue, 31 Mar 2026 06:06:54 +0000
Subject: [PATCH] Feat: port changes from PR #73 and #87

- Add support for the '-parallelism' terraform argument (#73)
- Exclude 'TF_LOG' from the environment variables passed to the terraform subprocess (#87)
---
 test/test_args.py | 4 ++++
 tftest.py         | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/test_args.py b/test/test_args.py
index 5d39aec..3e0ab0e 100644
--- a/test/test_args.py
+++ b/test/test_args.py
@@ -156,3 +156,7 @@ def test_var_args():
 def test_targets():
   assert tftest.parse_args(targets=['one', 'two']) == sorted(
       ['-target=one', '-target=two'])
+
+
+def test_parallelism_arg():
+  assert tftest.parse_args(parallelism=10) == ['-parallelism', 10]
diff --git a/tftest.py b/tftest.py
index 1565cb6..a419503 100644
--- a/tftest.py
+++ b/tftest.py
@@ -90,6 +90,7 @@ def parse_args(init_vars=None, tf_vars=None, targets=None, **kw):
       cmd_args.append(flag)
 
   kv_flags = {
+      'parallelism': '-parallelism',
       'plugin_dir': '-plugin-dir',
       'state': '-state',
   }
@@ -286,7 +287,7 @@ def __init__(self, tfdir, basedir=None, binary='terraform', env=None,
     self.binary = binary
     self.tfdir = self._abspath(tfdir)
     self._env = env or {}
-    self.env = os.environ.copy()
+    self.env = {k: v for k, v in os.environ.items() if k != 'TF_LOG'}
     self._plan_formatter = lambda out: TerraformPlanOutput(json.loads(out))
     self._output_formatter = lambda out: TerraformValueDict(json.loads(out))
     self.enable_cache = enable_cache