<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17097">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ttcn3: Refactor ttcn3 launching bits into a testlib<br><br>This way new tests can be more easily created which run some specific<br>TTCN3 test.<br><br>Change-Id: Ic61c7b7db9cf3050dc4b101ef0fb181421577424<br>---<br>A ttcn3/suites/ttcn3_bts_tests/lib/testlib.py<br>M ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py<br>2 files changed, 47 insertions(+), 36 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/97/17097/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py b/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py</span><br><span>new file mode 100644</span><br><span>index 0000000..9c673cd</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py</span><br><span>@@ -0,0 +1,42 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span style="color: hsl(120, 100%, 40%);">+import os</span><br><span style="color: hsl(120, 100%, 40%);">+from mako.template import Template</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester.testenv import *</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def run_ttcn3(suite, test_obj, testdir, bts, osmocon, nat_rsl_ip, ttcn3_test_execute):</span><br><span style="color: hsl(120, 100%, 40%);">+ own_dir = testdir</span><br><span style="color: hsl(120, 100%, 40%);">+ script_file = os.path.join(testdir, 'scripts', 'run_ttcn3_docker.sh')</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_tmpl_file = os.path.join(testdir, 'scripts', 'BTS_Tests.cfg.tmpl')</span><br><span style="color: hsl(120, 100%, 40%);">+ script_run_dir = test_obj.get_run_dir().new_dir('ttcn3')</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_cfg_file = os.path.join(str(script_run_dir), 'BTS_Tests.cfg')</span><br><span style="color: hsl(120, 100%, 40%);">+ junit_ttcn3_dst_file = os.path.join(str(suite.trial.get_run_dir()), 'trial-') + test_obj.basename + '.xml'</span><br><span style="color: hsl(120, 100%, 40%);">+ if bts.bts_type() == 'osmo-bts-trx':</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_available = True</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_sk = bts.pcu_socket_path()</span><br><span style="color: hsl(120, 100%, 40%);">+ else: # PCU unix socket not available locally</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_available = False</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_sk = ''</span><br><span style="color: hsl(120, 100%, 40%);">+ docker_cmd = (script_file, str(script_run_dir), junit_ttcn3_dst_file, nat_rsl_ip, osmocon.l2_socket_path(), pcu_sk)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ print('Creating template')</span><br><span style="color: hsl(120, 100%, 40%);">+ mytemplate = Template(filename=bts_tmpl_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ r = mytemplate.render(btsvty_ctrl_hostname=bts.remote_addr(), pcu_available=pcu_available, ttcn3_test_execute=ttcn3_test_execute)</span><br><span style="color: hsl(120, 100%, 40%);">+ with open(bts_cfg_file, 'w') as f:</span><br><span style="color: hsl(120, 100%, 40%);">+ f.write(r)</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%);">+ print('Starting TTCN3 tests')</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = process.Process('ttcn3', script_run_dir, docker_cmd)</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ proc.launch()</span><br><span style="color: hsl(120, 100%, 40%);">+ print('Starting TTCN3 launched, waiting until it finishes')</span><br><span style="color: hsl(120, 100%, 40%);">+ proc.wait(timeout=3600)</span><br><span style="color: hsl(120, 100%, 40%);">+ except Exception as e:</span><br><span style="color: hsl(120, 100%, 40%);">+ proc.terminate()</span><br><span style="color: hsl(120, 100%, 40%);">+ raise e</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if proc.result != 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError("run_ttcn3_docker.sh exited with error code %d" % proc.result)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ print('Done')</span><br><span>diff --git a/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py b/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py</span><br><span>index 4839052..a34c847 100755</span><br><span>--- a/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py</span><br><span>+++ b/ttcn3/suites/ttcn3_bts_tests/ttcn3_bts_tests.py</span><br><span>@@ -1,8 +1,10 @@</span><br><span> #!/usr/bin/env python3</span><br><span> import os</span><br><span style="color: hsl(0, 100%, 40%);">-from mako.template import Template</span><br><span> </span><br><span> from osmo_gsm_tester.testenv import *</span><br><span style="color: hsl(120, 100%, 40%);">+import testlib</span><br><span style="color: hsl(120, 100%, 40%);">+suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+from testlib import run_ttcn3</span><br><span> </span><br><span> ttcn3_test_execute="BTS_Tests.control"</span><br><span> </span><br><span>@@ -43,38 +45,5 @@</span><br><span> print('Starting osmocon')</span><br><span> osmocon.start()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-own_dir = os.path.dirname(os.path.realpath(__file__))</span><br><span style="color: hsl(0, 100%, 40%);">-script_file = os.path.join(own_dir, 'scripts', 'run_ttcn3_docker.sh')</span><br><span style="color: hsl(0, 100%, 40%);">-bts_tmpl_file = os.path.join(own_dir, 'scripts', 'BTS_Tests.cfg.tmpl')</span><br><span style="color: hsl(0, 100%, 40%);">-script_run_dir = test.get_run_dir().new_dir('ttcn3')</span><br><span style="color: hsl(0, 100%, 40%);">-bts_cfg_file = os.path.join(str(script_run_dir), 'BTS_Tests.cfg')</span><br><span style="color: hsl(0, 100%, 40%);">-junit_ttcn3_dst_file = os.path.join(str(suite.trial.get_run_dir()), 'trial-') + suite.name() + '.xml'</span><br><span style="color: hsl(0, 100%, 40%);">-if bts.bts_type() == 'osmo-bts-trx':</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_available = True</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_sk = bts.pcu_socket_path()</span><br><span style="color: hsl(0, 100%, 40%);">-else: # PCU unix socket not available locally</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_available = False</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_sk = ''</span><br><span style="color: hsl(0, 100%, 40%);">-docker_cmd = (script_file, str(script_run_dir), junit_ttcn3_dst_file, nat_rsl_ip, osmocon.l2_socket_path(), pcu_sk)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-print('Creating template')</span><br><span style="color: hsl(0, 100%, 40%);">-mytemplate = Template(filename=bts_tmpl_file)</span><br><span style="color: hsl(0, 100%, 40%);">-r = mytemplate.render(btsvty_ctrl_hostname=bts.remote_addr(), pcu_available=pcu_available, ttcn3_test_execute=ttcn3_test_execute)</span><br><span style="color: hsl(0, 100%, 40%);">-with open(bts_cfg_file, 'w') as f:</span><br><span style="color: hsl(0, 100%, 40%);">- f.write(r)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-print('Starting TTCN3 tests')</span><br><span style="color: hsl(0, 100%, 40%);">-proc = process.Process('ttcn3', script_run_dir, docker_cmd)</span><br><span style="color: hsl(0, 100%, 40%);">-try:</span><br><span style="color: hsl(0, 100%, 40%);">- proc.launch()</span><br><span style="color: hsl(0, 100%, 40%);">- print('Starting TTCN3 launched, waiting until it finishes')</span><br><span style="color: hsl(0, 100%, 40%);">- proc.wait(timeout=3600)</span><br><span style="color: hsl(0, 100%, 40%);">-except Exception as e:</span><br><span style="color: hsl(0, 100%, 40%);">- proc.terminate()</span><br><span style="color: hsl(0, 100%, 40%);">- raise e</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-if proc.result != 0:</span><br><span style="color: hsl(0, 100%, 40%);">- raise RuntimeError("run_ttcn3_docker.sh exited with error code %d" % proc.result)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-print('Done')</span><br><span style="color: hsl(120, 100%, 40%);">+testdir = os.path.dirname(os.path.realpath(__file__))</span><br><span style="color: hsl(120, 100%, 40%);">+run_ttcn3(suite, test, testdir, bts, osmocon, nat_rsl_ip, ttcn3_test_execute)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17097">change 17097</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/c/osmo-gsm-tester/+/17097"/><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-Change-Id: Ic61c7b7db9cf3050dc4b101ef0fb181421577424 </div>
<div style="display:none"> Gerrit-Change-Number: 17097 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>