This is an automated email from the ASF dual-hosted git repository.
amoghdesai pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 767b12e351f Prevent global SecretsMasker interference in concurrent
test execution (#55164)
767b12e351f is described below
commit 767b12e351f65b830560eca25023386180eed4f3
Author: Amogh Desai <[email protected]>
AuthorDate: Tue Sep 2 14:18:53 2025 +0530
Prevent global SecretsMasker interference in concurrent test execution
(#55164)
---
.../tests/secrets_masker/test_secrets_masker.py | 32 ++++++++++++++--------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/shared/secrets_masker/tests/secrets_masker/test_secrets_masker.py
b/shared/secrets_masker/tests/secrets_masker/test_secrets_masker.py
index 944ffb8858d..09b5f6c5720 100644
--- a/shared/secrets_masker/tests/secrets_masker/test_secrets_masker.py
+++ b/shared/secrets_masker/tests/secrets_masker/test_secrets_masker.py
@@ -385,21 +385,31 @@ class TestSecretsMasker:
got = redact(val)
assert got == val
- def test_property_for_log_masking(self):
+ def test_property_for_log_masking(self, monkeypatch):
"""Test that log masking enable/disable methods."""
- masker1 = SecretsMasker()
- masker2 = SecretsMasker()
- assert masker1.is_log_masking_enabled()
- assert masker2.is_log_masking_enabled()
+ # store the original state before any patching
+ state = SecretsMasker.mask_secrets_in_logs
- masker2.disable_log_masking()
- assert not masker1.is_log_masking_enabled()
- assert not masker2.is_log_masking_enabled()
+ with monkeypatch.context() as mp:
+ mp.setattr(SecretsMasker, "mask_secrets_in_logs", True)
- masker1.enable_log_masking()
- assert masker1.is_log_masking_enabled()
- assert masker2.is_log_masking_enabled()
+ masker1 = SecretsMasker()
+ masker2 = SecretsMasker()
+
+ assert masker1.is_log_masking_enabled()
+ assert masker2.is_log_masking_enabled()
+
+ masker2.disable_log_masking()
+ assert not masker1.is_log_masking_enabled()
+ assert not masker2.is_log_masking_enabled()
+
+ masker1.enable_log_masking()
+ assert masker1.is_log_masking_enabled()
+ assert masker2.is_log_masking_enabled()
+
+ # assert we restored the original state
+ assert SecretsMasker.mask_secrets_in_logs == state
class TestShouldHideValueForKey:
