diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-12 23:59:07 +0100 |
---|---|---|
committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2018-03-22 04:35:28 +0000 |
commit | d6a769b51cb01f0a93fda9c792d7e1367e8e027b (patch) | |
tree | f4243698fe0dcf0b7b8390a74e368ac6ee937d3f /tests/msc_vlr/msc_vlr_test_call.c | |
parent | 3cffc2055d01b55e03e04c6d125581be93916ed0 (diff) |
trans_free: tear down conn when last transaction is done
In trans_free(), call subscr_conn_release_when_unused(), so that we are sure to
clean up after the last transaction is done.
This fixes an error where a conn lingered after a CC failure, because that code
path forgot to trigger cleanup.
Rationale: so far we were triggering the release check after each DTAP dispatch
(compl_l3 and "normal" DTAP), which is sufficient for properly closed
transactions. We also need a check for when a timeout clears an erratic trans.
Adjust test expectation of test_call_mo_to_unknown_timeout to show that the
error is now fixed.
msc_vlr_test_reject_concurrency now sees an additional release checking event
when the SMS transaction is done, which is expected and does not affect the
test otherwise.
Related: OS#2779
Change-Id: I46ff2e9b09b67e4e0d79cccf8c04936f17281fcb
Diffstat (limited to 'tests/msc_vlr/msc_vlr_test_call.c')
-rw-r--r-- | tests/msc_vlr/msc_vlr_test_call.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 3e9da6291..7f97c3596 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -482,20 +482,13 @@ static void test_call_mo_to_unknown_timeout() fake_time_passes(10, 23); btw("The CC Release times out and we still properly clear the conn"); - btw("ERROR: currently this is broken and will be fixed in a subsequent commit"); cc_to_mncc_expect_tx("", MNCC_REL_CNF); - expect_iu_release(); /* <-- will currently not work out */ + expect_iu_release(); fake_time_passes(10, 23); OSMO_ASSERT(cc_to_mncc_tx_confirmed); - /* EXPECTING ERROR: here, we should be able to do: OSMO_ASSERT(iu_release_sent); - EXPECT_CONN_COUNT(0); - */ - BTW("This test is currently expecting erratic behavior:"); - EXPECT_CONN_COUNT(1); - /* need to free manually for the sake of this test suite */ - msc_subscr_conn_close(g_conn, 0); + EXPECT_CONN_COUNT(0); clear_vlr(); comment_end(); } |