<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11517">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: HACK to integrate suite_run in osmo_ms_driver<br><br>Template system still need to be ported to osmo-gsm-tester one, and Loop<br>needs to be moved to EventLoop.<br><br>Change-Id: Ic84a549f2fbe5fc0700f501a5e08dbaa9f5cbb78<br>---<br>M src/osmo_ms_driver/__main__.py<br>1 file changed, 30 insertions(+), 21 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/17/11517/1</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 1573084..8fcd154 100644</span><br><span>--- a/src/osmo_ms_driver/__main__.py</span><br><span>+++ b/src/osmo_ms_driver/__main__.py</span><br><span>@@ -50,6 +50,8 @@</span><br><span> parser.add_argument('-m', '--number-ms', dest="num_ms",</span><br><span> default=10, type=int,</span><br><span> help="Number of MobileStations to simulate")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_argument('trial_package',</span><br><span style="color: hsl(120, 100%, 40%);">+ help='Directory containing binaries to test')</span><br><span> return parser</span><br><span> </span><br><span> def main():</span><br><span>@@ -61,35 +63,42 @@</span><br><span> # We don't care what is happening to child processes we spawn!</span><br><span> signal.signal(signal.SIGCHLD, signal.SIG_IGN)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- loop = SimpleLoop()</span><br><span style="color: hsl(120, 100%, 40%);">+ with trial.Trial(args.trial_package) as current_trial:</span><br><span style="color: hsl(120, 100%, 40%);">+ current_trial.verify()</span><br><span style="color: hsl(120, 100%, 40%);">+ suite_scenario_str, suite_def, scenarios = suite.load_suite_scenario_str("nitb_netreg_mass")</span><br><span style="color: hsl(120, 100%, 40%);">+ current_trial.add_suite_run(suite_scenario_str, suite_def, scenarios)</span><br><span style="color: hsl(120, 100%, 40%);">+ #current_trial.run_suites(test_names)</span><br><span style="color: hsl(120, 100%, 40%);">+ suite_run = current_trial.suites[0]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- tmp_dir = tempfile.mkdtemp(suffix="osmo-ms-driver")</span><br><span style="color: hsl(0, 100%, 40%);">- log.log("Going to store files in ", tmp_dir=tmp_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ loop = SimpleLoop()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # How long should starting all apps take</span><br><span style="color: hsl(0, 100%, 40%);">- time_start=datetime.timedelta(seconds=args.launch_duration)</span><br><span style="color: hsl(0, 100%, 40%);">- # In which steps to start processes</span><br><span style="color: hsl(0, 100%, 40%);">- time_step=datetime.timedelta(milliseconds=args.launch_interval)</span><br><span style="color: hsl(120, 100%, 40%);">+ tmp_dir = tempfile.mkdtemp(suffix="osmo-ms-driver")</span><br><span style="color: hsl(120, 100%, 40%);">+ log.log("Going to store files in ", tmp_dir=tmp_dir)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Event server path</span><br><span style="color: hsl(0, 100%, 40%);">- event_server_path = os.path.join(tmp_dir, "osmo_ms_driver.unix")</span><br><span style="color: hsl(120, 100%, 40%);">+ # How long should starting all apps take</span><br><span style="color: hsl(120, 100%, 40%);">+ time_start=datetime.timedelta(seconds=args.launch_duration)</span><br><span style="color: hsl(120, 100%, 40%);">+ # In which steps to start processes</span><br><span style="color: hsl(120, 100%, 40%);">+ time_step=datetime.timedelta(milliseconds=args.launch_interval)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # The function that decides when to start something</span><br><span style="color: hsl(0, 100%, 40%);">- cdf = cdfs[args.cdf_name](time_start, time_step)</span><br><span style="color: hsl(120, 100%, 40%);">+ # Event server path</span><br><span style="color: hsl(120, 100%, 40%);">+ event_server_path = os.path.join(tmp_dir, "osmo_ms_driver.unix")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Event server to handle MS->test events</span><br><span style="color: hsl(0, 100%, 40%);">- ev_server = EventServer("ev_server", event_server_path)</span><br><span style="color: hsl(0, 100%, 40%);">- ev_server.listen(loop)</span><br><span style="color: hsl(120, 100%, 40%);">+ # The function that decides when to start something</span><br><span style="color: hsl(120, 100%, 40%);">+ cdf = cdfs[args.cdf_name](time_start, time_step)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Just a single test for now.</span><br><span style="color: hsl(0, 100%, 40%);">- test = MassUpdateLocationTest("lu_test", args.num_ms, cdf, ev_server, tmp_dir)</span><br><span style="color: hsl(0, 100%, 40%);">- atexit.register(test.stop_all)</span><br><span style="color: hsl(120, 100%, 40%);">+ # Event server to handle MS->test events</span><br><span style="color: hsl(120, 100%, 40%);">+ ev_server = EventServer("ev_server", event_server_path)</span><br><span style="color: hsl(120, 100%, 40%);">+ ev_server.listen(loop)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Run until everything has been launched</span><br><span style="color: hsl(0, 100%, 40%);">- test.run_test(loop, timedelta(seconds=args.test_duration))</span><br><span style="color: hsl(120, 100%, 40%);">+ # Just a single test for now.</span><br><span style="color: hsl(120, 100%, 40%);">+ test = MassUpdateLocationTest(suite_run, "lu_test", args.num_ms, cdf, ev_server, tmp_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ atexit.register(test.stop_all)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Print stats</span><br><span style="color: hsl(0, 100%, 40%);">- test.print_stats()</span><br><span style="color: hsl(120, 100%, 40%);">+ # Run until everything has been launched</span><br><span style="color: hsl(120, 100%, 40%);">+ test.run_test(loop, timedelta(seconds=args.test_duration))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Print stats</span><br><span style="color: hsl(120, 100%, 40%);">+ test.print_stats()</span><br><span> </span><br><span> if __name__ == '__main__':</span><br><span> main()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11517">change 11517</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/11517"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ic84a549f2fbe5fc0700f501a5e08dbaa9f5cbb78 </div>
<div style="display:none"> Gerrit-Change-Number: 11517 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>