[PATCH] osmo-ttcn3-hacks[master]: hlr: Make test run again using current OsmoHLR / TTCN-3 library

[Harald Welte]

Review at  https://gerrit.osmocom.org/7030

hlr: Make test run again using current OsmoHLR / TTCN-3 library

Change-Id: I4304d6f69a349845d74a9dbe5e366525d5d8956f
---
M hlr/HLR_Tests.default
M hlr/HLR_Tests.ttcn
2 files changed, 15 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/7030/1

diff --git a/hlr/HLR_Tests.default b/hlr/HLR_Tests.default
index d29f2dd..91d5454 100644
--- a/hlr/HLR_Tests.default
+++ b/hlr/HLR_Tests.default
@@ -4,7 +4,7 @@
 [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 c48592e..ef02970 100644
--- a/hlr/HLR_Tests.ttcn
+++ b/hlr/HLR_Tests.ttcn
@@ -37,6 +37,15 @@
 	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 @@
 		[] 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");
 		}
 	}
 }

-- 
To view, visit https://gerrit.osmocom.org/7030
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4304d6f69a349845d74a9dbe5e366525d5d8956f
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>