msc_vlr_tests: revert IMSI parameter and test nr output
Three recently merged commits take the msc_vlr_tests in a wrong direction.
The IMSI is usually encoded in the hex streams. The rationale behind hex
streams is that it is a) easily copied from a wireshark trace and b) exactly
the bytes as sent by an actual phone. It is hard to parameterize the IMSI
because we would have to employ our encoding functions, which I intentionally
want to keep out of the loop here.
The test number should not appear in the normal test output, so that adding a
test or changing their order does not affect expected output for following
tests. The nr is simply for manual invocation, only seen when invoked with -v.
Revert
- "VLR tests: always print test parameters"
b0a4314911140b1599cccfc8171fcdab4cd9bfab.
- "Expand VLR tests"
d5feadeee8dd24f991df2892d6bcf0be8b0cf707.
- "Move IMSI into test parameters"
093300d141c300651954473d73138b72de04d931.
Change-Id: Ie1b49237746751021da88f6f07bbb9f780d077c9
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
index 6a7a83c..66f40ce 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
@@ -1,4 +1,4 @@
-===== [1] test_reject_2nd_conn(901700000004620)...
+===== test_reject_2nd_conn
- Location Update Request on one connection
MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
new conn
@@ -149,12 +149,12 @@
lu_result_sent == 1
llist_count(&net->subscr_conns) == 0
DREF freeing VLR subscr MSISDN:46071
-===== [1] test_reject_2nd_conn(901700000004620): SUCCESS
+===== test_reject_2nd_conn: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
talloc_total_blocks(tall_bsc_ctx) == 7
-===== [2] test_reject_lu_during_lu(901700000004620)...
+===== test_reject_lu_during_lu
- Location Update Request
MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
new conn
@@ -274,12 +274,12 @@
lu_result_sent == 1
llist_count(&net->subscr_conns) == 0
DREF freeing VLR subscr MSISDN:46071
-===== [2] test_reject_lu_during_lu(901700000004620): SUCCESS
+===== test_reject_lu_during_lu: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
talloc_total_blocks(tall_bsc_ctx) == 7
-===== [3] test_reject_cm_during_lu(901700000004620)...
+===== test_reject_cm_during_lu
- Location Update Request
MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
new conn
@@ -405,12 +405,12 @@
lu_result_sent == 1
llist_count(&net->subscr_conns) == 0
DREF freeing VLR subscr MSISDN:46071
-===== [3] test_reject_cm_during_lu(901700000004620): SUCCESS
+===== test_reject_cm_during_lu: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
talloc_total_blocks(tall_bsc_ctx) == 7
-===== [4] test_reject_paging_resp_during_lu(901700000004620)...
+===== test_reject_paging_resp_during_lu
- Location Update Request
MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
new conn
@@ -531,12 +531,12 @@
lu_result_sent == 1
llist_count(&net->subscr_conns) == 0
DREF freeing VLR subscr MSISDN:46071
-===== [4] test_reject_paging_resp_during_lu(901700000004620): SUCCESS
+===== test_reject_paging_resp_during_lu: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
talloc_total_blocks(tall_bsc_ctx) == 7
-===== [5] test_reject_lu_during_cm(901700000004620)...
+===== test_reject_lu_during_cm
---
- Subscriber does a normal LU
- Location Update Request
@@ -724,12 +724,12 @@
DREF freeing VLR subscr MSISDN:46071
bssap_clear_sent == 1
llist_count(&net->subscr_conns) == 0
-===== [5] test_reject_lu_during_cm(901700000004620): SUCCESS
+===== test_reject_lu_during_cm: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
talloc_total_blocks(tall_bsc_ctx) == 7
-===== [6] test_reject_cm_during_cm(901700000004620)...
+===== test_reject_cm_during_cm
---
- Subscriber does a normal LU
- Location Update Request
@@ -919,12 +919,12 @@
DREF freeing VLR subscr MSISDN:46071
bssap_clear_sent == 1
llist_count(&net->subscr_conns) == 0
-===== [6] test_reject_cm_during_cm(901700000004620): SUCCESS
+===== test_reject_cm_during_cm: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
talloc_total_blocks(tall_bsc_ctx) == 7
-===== [7] test_reject_paging_resp_during_cm(901700000004620)...
+===== test_reject_paging_resp_during_cm
---
- Subscriber does a normal LU
- Location Update Request
@@ -1120,12 +1120,12 @@
- all requests serviced, conn has been released
llist_count(&net->subscr_conns) == 0
DREF freeing VLR subscr MSISDN:46071
-===== [7] test_reject_paging_resp_during_cm(901700000004620): SUCCESS
+===== test_reject_paging_resp_during_cm: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
talloc_total_blocks(tall_bsc_ctx) == 7
-===== [8] test_reject_lu_during_paging_resp(901700000004620)...
+===== test_reject_lu_during_paging_resp
---
- Subscriber does a normal LU
- Location Update Request
@@ -1347,12 +1347,12 @@
- SMS is done
llist_count(&net->subscr_conns) == 0
DREF freeing VLR subscr MSISDN:46071
-===== [8] test_reject_lu_during_paging_resp(901700000004620): SUCCESS
+===== test_reject_lu_during_paging_resp: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
talloc_total_blocks(tall_bsc_ctx) == 7
-===== [9] test_accept_cm_during_paging_resp(901700000004620)...
+===== test_accept_cm_during_paging_resp
---
- Subscriber does a normal LU
- Location Update Request
@@ -1591,12 +1591,12 @@
DREF freeing VLR subscr MSISDN:46071
bssap_clear_sent == 1
llist_count(&net->subscr_conns) == 0
-===== [9] test_accept_cm_during_paging_resp(901700000004620): SUCCESS
+===== test_accept_cm_during_paging_resp: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
talloc_total_blocks(tall_bsc_ctx) == 7
-===== [10] test_reject_paging_resp_during_paging_resp(901700000004620)...
+===== test_reject_paging_resp_during_paging_resp
---
- Subscriber does a normal LU
- Location Update Request
@@ -1817,7 +1817,7 @@
- SMS is done
llist_count(&net->subscr_conns) == 0
DREF freeing VLR subscr MSISDN:46071
-===== [10] test_reject_paging_resp_during_paging_resp(901700000004620): SUCCESS
+===== test_reject_paging_resp_during_paging_resp: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
talloc_total_blocks(tall_bsc_ctx) == 7