[PATCH] osmo-msc[master]: Move IMSI into test parameters

2018-02-07 Thread Max 
Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/6288

to look at the new patch set (#3).

Move IMSI into test parameters

This makes test routines more flexible and allows to easier re-use them
for tests with different IMSIs.

Change-Id: I74d46fdb7e87dc04c6b82a0b6f3ce6bef60bde58
Related: OS#2864
---
M tests/msc_vlr/msc_vlr_test_gsm_authen.c
M tests/msc_vlr/msc_vlr_test_gsm_ciph.c
M tests/msc_vlr/msc_vlr_test_hlr_reject.c
M tests/msc_vlr/msc_vlr_test_ms_timeout.c
M tests/msc_vlr/msc_vlr_test_no_authen.c
M tests/msc_vlr/msc_vlr_test_reject_concurrency.c
M tests/msc_vlr/msc_vlr_tests.c
M tests/msc_vlr/msc_vlr_tests.h
8 files changed, 32 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/88/6288/3

diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c 
b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
index 70b7614..2bcdd3c 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
@@ -23,10 +23,9 @@
 
 #include "msc_vlr_tests.h"
 
-void test_gsm_authen()
+void test_gsm_authen(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -213,10 +212,9 @@
comment_end();
 }
 
-void test_gsm_authen_tmsi()
+void test_gsm_authen_tmsi(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -490,10 +488,9 @@
comment_end();
 }
 
-void test_gsm_authen_imei()
+void test_gsm_authen_imei(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -586,10 +583,9 @@
comment_end();
 }
 
-void test_gsm_authen_tmsi_imei()
+void test_gsm_authen_tmsi_imei(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c 
b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
index 42e620a..38f07bb 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
@@ -23,10 +23,9 @@
 
 #include "msc_vlr_tests.h"
 
-void test_ciph()
+void test_ciph(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -235,10 +234,9 @@
comment_end();
 }
 
-void test_ciph_tmsi()
+void test_ciph_tmsi(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -474,10 +472,9 @@
comment_end();
 }
 
-void test_ciph_imei()
+void test_ciph_imei(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -576,10 +573,9 @@
comment_end();
 }
 
-void test_ciph_imeisv()
+void test_ciph_imeisv(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -674,10 +670,9 @@
comment_end();
 }
 
-void test_ciph_tmsi_imei()
+void test_ciph_tmsi_imei(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c 
b/tests/msc_vlr/msc_vlr_test_hlr_reject.c
index 6cf4afc..76cfb47 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c
@@ -75,10 +75,9 @@
comment_end();
 }
 
-void test_hlr_rej_auth_info_net_fail_no_reuse_tuples()
+void test_hlr_rej_auth_info_net_fail_no_reuse_tuples(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -162,10 +161,9 @@
comment_end();
 }
 
-void test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples()
+void test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -282,10 +280,9 @@
comment_end();
 }
 
-void test_hlr_rej_auth_info_net_fail_reuse_tuples()
+void test_hlr_rej_auth_info_net_fail_reuse_tuples(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c 
b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
index 4cfd035..d5f4bb0 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
@@ -182,10 +182,9 @@
comment_end();
 }
 
-void test_ms_timeout_paging()
+void test_ms_timeout_paging(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
rx_from_ran = RAN_GERAN_A;
 
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c 
b/tests/msc_vlr/msc_vlr_test_no_authen.c
index 32e0b40..e193f27 100644
---

[PATCH] osmo-msc[master]: Move IMSI into test parameters

2018-02-06 Thread Max 

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

Move IMSI into test parameters

This makes test routines more flexible and allows to easier re-use them
for tests with different IMSIs.

Change-Id: I74d46fdb7e87dc04c6b82a0b6f3ce6bef60bde58
Related: OS#2864
---
M tests/msc_vlr/msc_vlr_test_gsm_authen.c
M tests/msc_vlr/msc_vlr_test_gsm_ciph.c
M tests/msc_vlr/msc_vlr_test_hlr_reject.c
M tests/msc_vlr/msc_vlr_test_ms_timeout.c
M tests/msc_vlr/msc_vlr_test_no_authen.c
M tests/msc_vlr/msc_vlr_test_reject_concurrency.c
M tests/msc_vlr/msc_vlr_tests.c
M tests/msc_vlr/msc_vlr_tests.h
8 files changed, 32 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/88/6288/1

diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c 
b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
index 70b7614..2bcdd3c 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
@@ -23,10 +23,9 @@
 
 #include "msc_vlr_tests.h"
 
-void test_gsm_authen()
+void test_gsm_authen(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -213,10 +212,9 @@
comment_end();
 }
 
-void test_gsm_authen_tmsi()
+void test_gsm_authen_tmsi(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -490,10 +488,9 @@
comment_end();
 }
 
-void test_gsm_authen_imei()
+void test_gsm_authen_imei(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -586,10 +583,9 @@
comment_end();
 }
 
-void test_gsm_authen_tmsi_imei()
+void test_gsm_authen_tmsi_imei(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c 
b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
index 42e620a..38f07bb 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
@@ -23,10 +23,9 @@
 
 #include "msc_vlr_tests.h"
 
-void test_ciph()
+void test_ciph(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -235,10 +234,9 @@
comment_end();
 }
 
-void test_ciph_tmsi()
+void test_ciph_tmsi(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -474,10 +472,9 @@
comment_end();
 }
 
-void test_ciph_imei()
+void test_ciph_imei(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -576,10 +573,9 @@
comment_end();
 }
 
-void test_ciph_imeisv()
+void test_ciph_imeisv(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -674,10 +670,9 @@
comment_end();
 }
 
-void test_ciph_tmsi_imei()
+void test_ciph_tmsi_imei(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c 
b/tests/msc_vlr/msc_vlr_test_hlr_reject.c
index 6cf4afc..76cfb47 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c
@@ -75,10 +75,9 @@
comment_end();
 }
 
-void test_hlr_rej_auth_info_net_fail_no_reuse_tuples()
+void test_hlr_rej_auth_info_net_fail_no_reuse_tuples(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -162,10 +161,9 @@
comment_end();
 }
 
-void test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples()
+void test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
@@ -282,10 +280,9 @@
comment_end();
 }
 
-void test_hlr_rej_auth_info_net_fail_reuse_tuples()
+void test_hlr_rej_auth_info_net_fail_reuse_tuples(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
comment_start();
 
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c 
b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
index 4cfd035..d5f4bb0 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
@@ -182,10 +182,9 @@
comment_end();
 }
 
-void test_ms_timeout_paging()
+void test_ms_timeout_paging(const char *imsi)
 {
struct vlr_subscr *vsub;
-   const char *imsi = "90170004620";
 
rx_from_ran = RAN_GERAN_A;
 
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c 
b/tests/msc_vlr/msc_vlr_test_no_authen.c
index 32e0b40..e193f27 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.c
@@ -23,10 +23,9 @@
 
 #include "msc_vlr_tests.h"