<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18657">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">process: Fix wrong use of log.ctx(self)<br><br>That's not needed and will produce some parent loop detection in<br>log.find_on_stack() if logging is called under that stack frame.<br><br>Change-Id: I4ab7e8977fa9bad5c8956b7c1df1513b27bb5aa2<br>---<br>M src/osmo_gsm_tester/core/log.py<br>M src/osmo_gsm_tester/core/process.py<br>2 files changed, 6 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/core/log.py b/src/osmo_gsm_tester/core/log.py</span><br><span>index d60bf0b..8ae55d9 100644</span><br><span>--- a/src/osmo_gsm_tester/core/log.py</span><br><span>+++ b/src/osmo_gsm_tester/core/log.py</span><br><span>@@ -318,8 +318,12 @@</span><br><span>     f = sys._getframe(2)</span><br><span>     if origin_or_str is None:</span><br><span>         f.f_locals.pop(LOG_CTX_VAR, None)</span><br><span style="color: hsl(0, 100%, 40%);">-    else:</span><br><span style="color: hsl(0, 100%, 40%);">-        f.f_locals[LOG_CTX_VAR] = origin_or_str</span><br><span style="color: hsl(120, 100%, 40%);">+        return</span><br><span style="color: hsl(120, 100%, 40%);">+    if isinstance(origin_or_str, Origin) and origin_or_str is f.f_locals.get('self'):</span><br><span style="color: hsl(120, 100%, 40%);">+        # Avoid adding log ctx in stack frame where Origin it is already "self",</span><br><span style="color: hsl(120, 100%, 40%);">+        # it is not needed and will make find_on_stack() to malfunction</span><br><span style="color: hsl(120, 100%, 40%);">+        raise Error('Don\'t use log.ctx(self), it\'s not needed!')</span><br><span style="color: hsl(120, 100%, 40%);">+    f.f_locals[LOG_CTX_VAR] = origin_or_str</span><br><span> </span><br><span> class OriginLoopError(Error):</span><br><span>     pass</span><br><span>diff --git a/src/osmo_gsm_tester/core/process.py b/src/osmo_gsm_tester/core/process.py</span><br><span>index 320f9ec..36ed057 100644</span><br><span>--- a/src/osmo_gsm_tester/core/process.py</span><br><span>+++ b/src/osmo_gsm_tester/core/process.py</span><br><span>@@ -196,7 +196,6 @@</span><br><span>             self.terminate()</span><br><span>             raise e</span><br><span>         if raise_nonsuccess and self.result != 0:</span><br><span style="color: hsl(0, 100%, 40%);">-            log.ctx(self)</span><br><span>             raise log.Error('Exited in error %d' % self.result)</span><br><span>         return self.result</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18657">change 18657</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18657"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4ab7e8977fa9bad5c8956b7c1df1513b27bb5aa2 </div>
<div style="display:none"> Gerrit-Change-Number: 18657 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>