<p>Holger Freyther <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13825">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">virtual: Introduce a base class for test cases<br><br>Introduce a base class with the intended life cycle and use it.<br><br>Change-Id: I97968fb02436d5ac8248fc8020539e1af547b030<br>---<br>M src/osmo_gsm_tester/ms_driver.py<br>M src/osmo_ms_driver/location_update_test.py<br>M src/osmo_ms_driver/test_support.py<br>3 files changed, 38 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py</span><br><span>index d35f02e..dddedf7 100644</span><br><span>--- a/src/osmo_gsm_tester/ms_driver.py</span><br><span>+++ b/src/osmo_gsm_tester/ms_driver.py</span><br><span>@@ -114,7 +114,9 @@</span><br><span> """</span><br><span> if not self._configured:</span><br><span> self.configure()</span><br><span style="color: hsl(120, 100%, 40%);">+ self._test_case.before_start()</span><br><span> deadline = self._starter.start_all(self._loop, self._test_duration)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._test_case.after_start()</span><br><span> self._test_case.wait_for_test(self._loop, deadline)</span><br><span> </span><br><span> def print_stats(self):</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 7a58b93..1a33f09 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>@@ -16,10 +16,10 @@</span><br><span> # You should have received a copy of the GNU General Public License</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from osmo_gsm_tester import log</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> from datetime import timedelta</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+from .test_support import TestBase</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> import collections</span><br><span> import json</span><br><span> import time</span><br><span>@@ -55,12 +55,10 @@</span><br><span> LUStats = collections.namedtuple("LUStats", ["num_attempted", "num_completed",</span><br><span> "min_latency", "max_latency"])</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class MassUpdateLocationTest(log.Origin):</span><br><span style="color: hsl(120, 100%, 40%);">+class MassUpdateLocationTest(TestBase):</span><br><span> def __init__(self, name, event_server, results):</span><br><span style="color: hsl(0, 100%, 40%);">- super().__init__(log.C_RUN, name)</span><br><span style="color: hsl(0, 100%, 40%);">- self._event_server = event_server</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(name, event_server, results)</span><br><span> self._event_server.register(self.handle_msg)</span><br><span style="color: hsl(0, 100%, 40%);">- self._results = results</span><br><span> </span><br><span> def configure(self, num_subscribers):</span><br><span> self._num_subscribers = num_subscribers</span><br><span>@@ -77,12 +75,12 @@</span><br><span> set_lu_time(ms, time)</span><br><span> self.log("MS performed LU ", ms=ms, at=time, lu_delay=lu_delay(ms))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def all_completed(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ def has_completed(self):</span><br><span> return self._outstanding == 0</span><br><span> </span><br><span> def wait_for_test(self, loop, deadline):</span><br><span> """Waits up to the absolute deadline for the test to complete."""</span><br><span style="color: hsl(0, 100%, 40%);">- while not self.all_completed():</span><br><span style="color: hsl(120, 100%, 40%);">+ while not self.has_completed():</span><br><span> now_time = time.clock_gettime(time.CLOCK_MONOTONIC)</span><br><span> sleep_time = deadline - now_time</span><br><span> if sleep_time < 0:</span><br><span>diff --git a/src/osmo_ms_driver/test_support.py b/src/osmo_ms_driver/test_support.py</span><br><span>index 670d795..cbfd444 100644</span><br><span>--- a/src/osmo_ms_driver/test_support.py</span><br><span>+++ b/src/osmo_ms_driver/test_support.py</span><br><span>@@ -15,6 +15,7 @@</span><br><span> # You should have received a copy of the GNU General Public License</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+from abc import ABCMeta</span><br><span> from osmo_gsm_tester import log</span><br><span> </span><br><span> def imsi_ki_gen():</span><br><span>@@ -63,3 +64,32 @@</span><br><span> def has_result(self, key):</span><br><span> """Returns true if there is a value for the key."""</span><br><span> return self._results.get(key) is not None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class TestBase(log.Origin, metaclass=ABCMeta):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Base class for all mass test cases."""</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, name, event_server, results):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(log.C_RUN, name)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._event_server = event_server</span><br><span style="color: hsl(120, 100%, 40%);">+ self._results = results</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def configure(self, num_subscribers):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Configures the test given the (number) of subscribers."""</span><br><span style="color: hsl(120, 100%, 40%);">+ pass</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def before_start(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Prepares the test for starting."""</span><br><span style="color: hsl(120, 100%, 40%);">+ pass</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def after_start(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Finishes the test after starting."""</span><br><span style="color: hsl(120, 100%, 40%);">+ pass</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def has_completed(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Returns true if the test has completed."""</span><br><span style="color: hsl(120, 100%, 40%);">+ pass</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def print_stats(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Prints statistics/results of the test."""</span><br><span style="color: hsl(120, 100%, 40%);">+ pass</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13825">change 13825</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/13825"/><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: I97968fb02436d5ac8248fc8020539e1af547b030 </div>
<div style="display:none"> Gerrit-Change-Number: 13825 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>