<p>Holger Freyther <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9717">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, but someone else must approve
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms: Simplify starting of the test and combine loop and wait<br><br>This will make it easier to strt different kind of tests. The cost<br>of calling step_once is hopefully neglectable as it simplifies the<br>test.<br><br>Change-Id: I3708ac382c0a34e17cf147d18f03603946437a53<br>---<br>M src/osmo_ms_driver/__main__.py<br>M src/osmo_ms_driver/location_update_test.py<br>2 files changed, 45 insertions(+), 42 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ms_driver/__main__.py b/src/osmo_ms_driver/__main__.py</span><br><span>index abc5e54..ef06393 100644</span><br><span>--- a/src/osmo_ms_driver/__main__.py</span><br><span>+++ b/src/osmo_ms_driver/__main__.py</span><br><span>@@ -82,10 +82,7 @@</span><br><span> atexit.register(test.stop_all)</span><br><span> </span><br><span> # Run until everything has been launched</span><br><span style="color: hsl(0, 100%, 40%);">- test.launch(loop)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # Wait for it to complete</span><br><span style="color: hsl(0, 100%, 40%);">- test.wait_for_result(loop)</span><br><span style="color: hsl(120, 100%, 40%);">+ test.run_test(loop)</span><br><span> </span><br><span> # Print stats</span><br><span> test.print_stats()</span><br><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 4b1c499..48c57eb 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>@@ -98,7 +98,7 @@</span><br><span> for phy in self._phys:</span><br><span> phy.verify_ready()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def launch(self, loop):</span><br><span style="color: hsl(120, 100%, 40%);">+ def prepare(self, loop):</span><br><span> self.log("Starting testcase")</span><br><span> </span><br><span> self.pre_launch(loop)</span><br><span>@@ -108,40 +108,57 @@</span><br><span> self._cdf.duration().total_seconds() + \</span><br><span> timedelta(seconds=120).total_seconds()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- current_time = self._start_time</span><br><span style="color: hsl(0, 100%, 40%);">- step_size = self._cdf.step_size().total_seconds()</span><br><span> self._started = []</span><br><span style="color: hsl(0, 100%, 40%);">- too_slow = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ self._too_slow = 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def step_once(self, loop, current_time):</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(self._unstarted) <= 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ return current_time, None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ step_size = self._cdf.step_size().total_seconds()</span><br><span> </span><br><span> # Start</span><br><span> self._cdf.step_once()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- while len(self._unstarted) > 0:</span><br><span style="color: hsl(0, 100%, 40%);">- # Check for timeout</span><br><span style="color: hsl(0, 100%, 40%);">- # start pending MS</span><br><span style="color: hsl(0, 100%, 40%);">- while len(self._started) < self._cdf.current_scaled_value() and len(self._unstarted) > 0:</span><br><span style="color: hsl(0, 100%, 40%);">- ms = self._unstarted.pop(0)</span><br><span style="color: hsl(0, 100%, 40%);">- ms.start(loop)</span><br><span style="color: hsl(0, 100%, 40%);">- launch_time = time.clock_gettime(time.CLOCK_MONOTONIC)</span><br><span style="color: hsl(0, 100%, 40%);">- self._results[ms.name_number()].set_launch_time(launch_time)</span><br><span style="color: hsl(0, 100%, 40%);">- self._started.append(ms)</span><br><span style="color: hsl(120, 100%, 40%);">+ # Check for timeout</span><br><span style="color: hsl(120, 100%, 40%);">+ # start pending MS</span><br><span style="color: hsl(120, 100%, 40%);">+ while len(self._started) < self._cdf.current_scaled_value() and len(self._unstarted) > 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ ms = self._unstarted.pop(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ ms.start(loop)</span><br><span style="color: hsl(120, 100%, 40%);">+ launch_time = time.clock_gettime(time.CLOCK_MONOTONIC)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._results[ms.name_number()].set_launch_time(launch_time)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._started.append(ms)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Progress and sleep</span><br><span style="color: hsl(0, 100%, 40%);">- self._cdf.step_once()</span><br><span style="color: hsl(120, 100%, 40%);">+ now_time = time.clock_gettime(time.CLOCK_MONOTONIC)</span><br><span style="color: hsl(120, 100%, 40%);">+ sleep_time = (current_time + step_size) - now_time</span><br><span style="color: hsl(120, 100%, 40%);">+ if sleep_time <= 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log("Starting too slowly. Moving on",</span><br><span style="color: hsl(120, 100%, 40%);">+ target=(current_time + step_size), now=now_time, sleep=sleep_time)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._too_slow += 1</span><br><span style="color: hsl(120, 100%, 40%);">+ sleep_time = 0</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if len(self._unstarted) == 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ end_time = time.clock_gettime(time.CLOCK_MONOTONIC)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log("All started...", too_slow=self._too_slow, duration=end_time - self._start_time)</span><br><span style="color: hsl(120, 100%, 40%);">+ return current_time, None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return current_time + step_size, sleep_time</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def run_test(self, loop):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.prepare(loop)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ to_complete_time = self._start_time + self.TEST_TIME.total_seconds()</span><br><span style="color: hsl(120, 100%, 40%);">+ tick_time = self._start_time</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ while not self.all_completed():</span><br><span style="color: hsl(120, 100%, 40%);">+ tick_time, sleep_time = self.step_once(loop, tick_time)</span><br><span> now_time = time.clock_gettime(time.CLOCK_MONOTONIC)</span><br><span style="color: hsl(0, 100%, 40%);">- sleep_time = (current_time + step_size) - now_time</span><br><span style="color: hsl(0, 100%, 40%);">- if sleep_time <= 0:</span><br><span style="color: hsl(0, 100%, 40%);">- self.log("Starting too slowly. Moving on",</span><br><span style="color: hsl(0, 100%, 40%);">- target=(current_time + step_size), now=now_time, sleep=sleep_time)</span><br><span style="color: hsl(0, 100%, 40%);">- too_slow += 1</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- loop.schedule_timeout(sleep_time)</span><br><span style="color: hsl(0, 100%, 40%);">- loop.select()</span><br><span style="color: hsl(0, 100%, 40%);">- current_time += step_size</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- end_time = time.clock_gettime(time.CLOCK_MONOTONIC)</span><br><span style="color: hsl(0, 100%, 40%);">- self.log("All started...", too_slow=too_slow, duration=end_time - self._start_time)</span><br><span style="color: hsl(120, 100%, 40%);">+ if sleep_time is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ sleep_time = to_complete_time - now_time</span><br><span style="color: hsl(120, 100%, 40%);">+ if sleep_time < 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ break</span><br><span style="color: hsl(120, 100%, 40%);">+ loop.schedule_timeout(sleep_time)</span><br><span style="color: hsl(120, 100%, 40%);">+ loop.select()</span><br><span> </span><br><span> def stop_all(self):</span><br><span> for launcher in self._started:</span><br><span>@@ -168,17 +185,6 @@</span><br><span> raise Exception("Unknown event type..:" + _data.decode())</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def wait_for_result(self, loop):</span><br><span style="color: hsl(0, 100%, 40%);">- to_complete_time = self._start_time + self.TEST_TIME.total_seconds()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while not self.all_completed():</span><br><span style="color: hsl(0, 100%, 40%);">- now_time = time.clock_gettime(time.CLOCK_MONOTONIC)</span><br><span style="color: hsl(0, 100%, 40%);">- sleep_time = to_complete_time - now_time</span><br><span style="color: hsl(0, 100%, 40%);">- if sleep_time < 0:</span><br><span style="color: hsl(0, 100%, 40%);">- break</span><br><span style="color: hsl(0, 100%, 40%);">- loop.schedule_timeout(sleep_time)</span><br><span style="color: hsl(0, 100%, 40%);">- loop.select()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> def all_completed(self):</span><br><span> return self._outstanding == 0</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9717">change 9717</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/9717"/><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: I3708ac382c0a34e17cf147d18f03603946437a53 </div>
<div style="display:none"> Gerrit-Change-Number: 9717 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>