<p>Holger Freyther <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9716">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms: Quit early when all tests concluded..<br><br>And fix the the detection if everything has completed.<br><br>Change-Id: I3575ee7618c35e3b66d25fa31844d267489d9179<br>---<br>M src/osmo_ms_driver/location_update_test.py<br>1 file changed, 11 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py</span><br><span>index 2a3c246..4b1c499 100644</span><br><span>--- a/src/osmo_ms_driver/location_update_test.py</span><br><span>+++ b/src/osmo_ms_driver/location_update_test.py</span><br><span>@@ -35,6 +35,9 @@</span><br><span>         assert self._time_of_lu is None</span><br><span>         self._time_of_lu = time</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def has_lu_time(self):</span><br><span style="color: hsl(120, 100%, 40%);">+        return self._time_of_lu is not None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     def lu_time(self):</span><br><span>         return self._time_of_lu or 0</span><br><span> </span><br><span>@@ -64,6 +67,7 @@</span><br><span>         self._results = {}</span><br><span>         imsi_gen = imsi_ki_gen()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        self._outstanding = number_of_ms</span><br><span>         for i in range(0, number_of_ms):</span><br><span>             ms_name = "%.5d" % i</span><br><span> </span><br><span>@@ -155,6 +159,8 @@</span><br><span>         elif data['type'] == 'event':</span><br><span>             if data['data']['lu_done'] == 1:</span><br><span>                 ms = self._results[data['ms']]</span><br><span style="color: hsl(120, 100%, 40%);">+                if not ms.has_lu_time():</span><br><span style="color: hsl(120, 100%, 40%);">+                    self._outstanding = self._outstanding - 1</span><br><span>                 ms.set_lu_time(time)</span><br><span>                 self.log("MS performed LU ", ms=ms, at=time, lu_delay=ms.lu_delay())</span><br><span>         else:</span><br><span>@@ -165,7 +171,7 @@</span><br><span>     def wait_for_result(self, loop):</span><br><span>         to_complete_time = self._start_time + self.TEST_TIME.total_seconds()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        while True:</span><br><span style="color: hsl(120, 100%, 40%);">+        while not self.all_completed():</span><br><span>             now_time = time.clock_gettime(time.CLOCK_MONOTONIC)</span><br><span>             sleep_time = to_complete_time - now_time</span><br><span>             if sleep_time < 0:</span><br><span>@@ -173,9 +179,11 @@</span><br><span>             loop.schedule_timeout(sleep_time)</span><br><span>             loop.select()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def all_completed(self):</span><br><span style="color: hsl(120, 100%, 40%);">+        return self._outstanding == 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     def print_stats(self):</span><br><span style="color: hsl(0, 100%, 40%);">-        from functools import reduce</span><br><span style="color: hsl(0, 100%, 40%);">-        all_completed = reduce(lambda b, ms: b and ms.lu_time() is not None, self._results.values(), True)</span><br><span style="color: hsl(120, 100%, 40%);">+        all_completed = self.all_completed()</span><br><span>         min_value = min(self._results.values(), key=lambda x: x.lu_delay())</span><br><span>         max_value = max(self._results.values(), key=lambda x: x.lu_delay())</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9716">change 9716</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/9716"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3575ee7618c35e3b66d25fa31844d267489d9179 </div>
<div style="display:none"> Gerrit-Change-Number: 9716 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>