From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Thu, 14 Mar 2024 01:48:23 +0000 (+1300)
Subject: pytest:segfault: do not assume PLEASE_NO_GDB_BACKTRACE var is unset
X-Git-Tag: tdb-1.4.11~1410
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c17ff0a3357f7f1d12c755b291fcce7ce4c7eb5a;p=thirdparty%2Fsamba.git

pytest:segfault: do not assume PLEASE_NO_GDB_BACKTRACE var is unset

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/tests/segfault.py b/python/samba/tests/segfault.py
index d676a21f9c6..885a9c91d11 100644
--- a/python/samba/tests/segfault.py
+++ b/python/samba/tests/segfault.py
@@ -58,11 +58,15 @@ def segfault_detector(f):
 def no_gdb_backtrace(f):
     from os import environ
     def w(*args, **kwargs):
-        environ['PLEASE_NO_GDB_BACKTRACE'] = '1'        
+        old = environ.get('PLEASE_NO_GDB_BACKTRACE')
+        environ['PLEASE_NO_GDB_BACKTRACE'] = '1'
         try:
             f(*args, **kwargs)
         finally:
-            del environ['PLEASE_NO_GDB_BACKTRACE']
+            if old is not None:
+                environ['PLEASE_NO_GDB_BACKTRACE'] = old
+            else:
+                del environ['PLEASE_NO_GDB_BACKTRACE']
 
     return w