diff options
author | Harald Welte <laforge@gnumonks.org> | 2018-03-01 16:49:29 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-03-01 16:49:29 +0100 |
commit | 79420ccab24d974dcc4e02bb44c3dd4691427528 (patch) | |
tree | f0085559a770e94af74b8b35281d155fea1d000d /hlr | |
parent | d3a88a684cf275f63c354f55ca2d32d2b2549ad5 (diff) |
hlr: Make test run again using current OsmoHLR / TTCN-3 library
Change-Id: I4304d6f69a349845d74a9dbe5e366525d5d8956f
Diffstat (limited to 'hlr')
-rw-r--r-- | hlr/HLR_Tests.default | 2 | ||||
-rw-r--r-- | hlr/HLR_Tests.ttcn | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/hlr/HLR_Tests.default b/hlr/HLR_Tests.default index d29f2dd2..91d5454f 100644 --- a/hlr/HLR_Tests.default +++ b/hlr/HLR_Tests.default @@ -4,7 +4,7 @@ mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING; // | DEBUG_ENCDEC; [TESTPORT_PARAMETERS] *.VTY.CTRL_MODE := "client" *.VTY.CTRL_HOSTNAME := "127.0.0.1" -*.VTY.CTRL_PORTNUM := "4241" +*.VTY.CTRL_PORTNUM := "4258" *.VTY.CTRL_LOGIN_SKIPPED := "yes" *.VTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" *.VTY.CTRL_READMODE := "buffered" diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index c48592e6..ef029709 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -37,6 +37,15 @@ function f_init() runs on test_CT { connect(vc_IPA:IPA_GSUP_PORT, self:GSUP); vc_IPA.start(IPA_Emulation.main_client(mp_hlr_ip, mp_hlr_gsup_port, "", -1, ccm_pars)); + timer T:= 10.0; + alt { + [] GSUP.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_UP}) { } + [] T.timeout { + setverdict(fail, "Timeout waiting for GSUP IPA Link to come up"); + self.stop; + } + } + f_init_vty(); f_ipa_ctrl_start(mp_hlr_ip, mp_hlr_ctrl_port); @@ -55,11 +64,14 @@ testcase TC_gsup_sai_err_invalid_imsi() runs on test_CT { [] GSUP.receive(tr_GSUP_SAI_ERR(imsi, 17)) { setverdict(pass); } + [] GSUP.receive(tr_GSUP_SAI_ERR(imsi, ?)) { + setverdict(fail, "Unexpected SAI ERROR Cause"); + } [] GSUP.receive(tr_GSUP_SAI_RES(imsi)) { - setverdict(fail); + setverdict(fail, "Unexpected SAI.res for unknown IMSI"); } [] T.timeout { - setverdict(inconc); + setverdict(fail, "Timeout waiting for SAI ERR"); } } } |