Fix ttcn3 testsuites after recent refactors

Change-Id: I545e3141ef56980e4ef2474b990bd4e4d4c21322
This commit is contained in:
Pau Espin 2020-06-09 14:32:14 +02:00
parent ef919c0f1c
commit f2c2a34726
2 changed files with 4 additions and 4 deletions

View File

@ -4,13 +4,13 @@ from mako.template import Template
from osmo_gsm_tester.testenv import *
def run_ttcn3(tenv, test_obj, testdir, bts, osmocon, nat_rsl_ip, ttcn3_test_execute, ttcn3_test_extra_module_params=""):
def run_ttcn3(tenv, testdir, bts, osmocon, nat_rsl_ip, ttcn3_test_execute, ttcn3_test_extra_module_params=""):
own_dir = testdir
script_file = os.path.join(testdir, 'scripts', 'run_ttcn3_docker.sh')
bts_tmpl_file = os.path.join(testdir, 'scripts', 'BTS_Tests.cfg.tmpl')
script_run_dir = test_obj.get_run_dir().new_dir('ttcn3')
script_run_dir = tenv.test().get_run_dir().new_dir('ttcn3')
bts_cfg_file = os.path.join(str(script_run_dir), 'BTS_Tests.cfg')
junit_ttcn3_dst_file = os.path.join(str(tenv.suite().trial().get_run_dir()), 'trial-') + test_obj.basename + '.xml'
junit_ttcn3_dst_file = os.path.join(str(tenv.suite().trial().get_run_dir()), 'trial-') + tenv.test().basename + '.xml'
if bts.bts_type() == 'osmo-bts-trx':
pcu_available = True
pcu_sk = bts.pcu_socket_path()

View File

@ -46,4 +46,4 @@ print('Starting osmocon')
osmocon.start()
testdir = os.path.dirname(os.path.realpath(__file__))
run_ttcn3(tenv. test, testdir, bts, osmocon, nat_rsl_ip, ttcn3_test_execute)
run_ttcn3(tenv, testdir, bts, osmocon, nat_rsl_ip, ttcn3_test_execute)