<p>Holger Freyther <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13804">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;">virtual: Unify the lua script into a single one<br><br>In the quest to support multiple testcases we will use a single<br>script. Parts can be enabled/disabled depending on which tests<br>we want/need to run.<br><br>Change-Id: I8a093671173976eba9215c00a7aea0f6cab467c6<br>---<br>R src/osmo_gsm_tester/templates/osmo-mobile.lua.tmpl<br>M src/osmo_ms_driver/location_update_test.py<br>M src/osmo_ms_driver/starter.py<br>3 files changed, 10 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/templates/osmo-mobile-lu.lua.tmpl b/src/osmo_gsm_tester/templates/osmo-mobile.lua.tmpl</span><br><span>similarity index 73%</span><br><span>rename from src/osmo_gsm_tester/templates/osmo-mobile-lu.lua.tmpl</span><br><span>rename to src/osmo_gsm_tester/templates/osmo-mobile.lua.tmpl</span><br><span>index c25d799..0adb895 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-mobile-lu.lua.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-mobile.lua.tmpl</span><br><span>@@ -2,13 +2,20 @@</span><br><span> event = require('ms_support')</span><br><span> send = 1</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function mm_cb(new_state, new_substate, old_substate)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+function lu_test_mm_cb(new_state, new_substate, old_substate)</span><br><span>         if new_state == 19 and new_substate == 1 and send == 1 then</span><br><span>             send = 0</span><br><span>             event.send({lu_done=1})</span><br><span>         end</span><br><span> end</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function mm_cb(new_state, new_substate, old_substate)</span><br><span style="color: hsl(120, 100%, 40%);">+% if test.run_lu_test:</span><br><span style="color: hsl(120, 100%, 40%);">+ lu_test_mm_cb(new_state, new_substate, old_substate)</span><br><span style="color: hsl(120, 100%, 40%);">+% endif</span><br><span style="color: hsl(120, 100%, 40%);">+end</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> local cbs = {</span><br><span>         Mm=mm_cb</span><br><span> }</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 5ff2199..82c1cb3 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>@@ -59,7 +59,7 @@</span><br><span>     decides how quickly to start them and a timeout.</span><br><span>     """</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    TEMPLATE_LUA = "osmo-mobile-lu.lua"</span><br><span style="color: hsl(120, 100%, 40%);">+    TEMPLATE_LUA = "osmo-mobile.lua"</span><br><span>     TEMPLATE_CFG = "osmo-mobile.cfg"</span><br><span> </span><br><span>     def __init__(self, name, options, cdf_function,</span><br><span>diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py</span><br><span>index 010947b..20977d6 100644</span><br><span>--- a/src/osmo_ms_driver/starter.py</span><br><span>+++ b/src/osmo_ms_driver/starter.py</span><br><span>@@ -91,6 +91,7 @@</span><br><span>             'test': {</span><br><span>                 'event_path': self._ev_server_path,</span><br><span>                 'lua_support': lua_support,</span><br><span style="color: hsl(120, 100%, 40%);">+                'run_lu_test': True,</span><br><span>             }</span><br><span>         }</span><br><span>         lua_cfg_file = os.path.join(self._tmp_dir, "lua_" + self._name_number + ".lua")</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13804">change 13804</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/13804"/><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: I8a093671173976eba9215c00a7aea0f6cab467c6 </div>
<div style="display:none"> Gerrit-Change-Number: 13804 </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: 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>