<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18781">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">log: Fix OriginLoopError generated in log.Error from testenv.poll()<br><br>Change-Id: Iea80d06a30346533e4ecec338b03c72d1f1067ae<br>---<br>M src/osmo_gsm_tester/core/log.py<br>1 file changed, 6 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/81/18781/1</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 2cf1af0..184294c 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>@@ -386,11 +386,12 @@</span><br><span>             f = f.f_back</span><br><span> </span><br><span>         if (origin is not None) and (log_ctx_obj is not None):</span><br><span style="color: hsl(0, 100%, 40%);">-            log_ctx_obj.highest_ancestor()._set_parent(origin)</span><br><span style="color: hsl(0, 100%, 40%);">-            p = log_ctx_obj</span><br><span style="color: hsl(0, 100%, 40%);">-            while p:</span><br><span style="color: hsl(0, 100%, 40%);">-                p._set_log_category(origin._log_category)</span><br><span style="color: hsl(0, 100%, 40%);">-                p = p._parent</span><br><span style="color: hsl(120, 100%, 40%);">+            log_ctx_highest_ancestor = log_ctx_obj.highest_ancestor()</span><br><span style="color: hsl(120, 100%, 40%);">+            # If Both end up in same ancestor it means they are connected to the</span><br><span style="color: hsl(120, 100%, 40%);">+            # same tree, so no need to connect them, we'll use log_ctx_obj</span><br><span style="color: hsl(120, 100%, 40%);">+            # specific path in that case.</span><br><span style="color: hsl(120, 100%, 40%);">+            if log_ctx_highest_ancestor != origin.highest_ancestor():</span><br><span style="color: hsl(120, 100%, 40%);">+                log_ctx_highest_ancestor._set_parent(origin)</span><br><span>         if log_ctx_obj is not None:</span><br><span>             return log_ctx_obj</span><br><span>         # may return None</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18781">change 18781</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/+/18781"/><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: Iea80d06a30346533e4ecec338b03c72d1f1067ae </div>
<div style="display:none"> Gerrit-Change-Number: 18781 </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-MessageType: newchange </div>