diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2019-09-04 11:35:56 +0200 |
|---|---|---|
| committer | osmith <osmith@sysmocom.de> | 2019-09-06 07:24:49 +0000 |
| commit | e1c00f022d7b703c86194b54435c9622f104f8aa (patch) | |
| tree | cb2d3b72c4fa16d2160cfe3bf26b6ec5a3aa4636 | |
| parent | 1f4486cfe34856d3236392b52916e92be6c6c75c (diff) | |
Revert "bts: f_init_pcu: sleep before connect"
This reverts commit c089b415f5e3bbf5eb2de435b925581ca42d8872. The
additional sleep caused other tests to break, probably because it
triggered race conditions:
* TC_pcu_socket_connect_multi
* TC_pcu_socket_connect_si3gprs
* TC_si_sched_13_2bis_2ter_2quater
Adjust TC_pcu_socket_verify_info_ind test case error message to mention
OS#4179. This test is flapping now, most of the time the BTS sends a
CellID 0 because it did not receive the real CellID from the BSC yet.
Related: OS#4179
Change-Id: I2115c337f4601a4614b140715323c42803b003ee
| -rw-r--r-- | bts/BTS_Tests.ttcn | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 15948a33..2c11ca23 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -324,9 +324,6 @@ private function f_init_pcu(PCUIF_CODEC_PT pt, charstring id, pcu_conn_id := -1; return; } - - f_sleep(0.5); /* workaround for OS#4179 */ - pcu_conn_id := f_pcuif_connect(pt, mp_pcu_socket); T.start; @@ -4876,7 +4873,9 @@ testcase TC_pcu_socket_verify_info_ind() runs on test_CT { var uint16_t cell_id_si3 := si3.payload.si3.cell_id; var uint16_t cell_id_pcu := g_pcu_last_info.u.info_ind.cell_id; if (cell_id_si3 != cell_id_pcu) { - setverdict(fail, "Expected cell_id ", cell_id_si3, " got: ", cell_id_pcu); + setverdict(fail, "Expected cell_id '", cell_id_si3, "' and got '", cell_id_pcu, "'. This either means,", + " that the BTS is sending the wrong cell_id, or that the BTS sent it too early", + " (OS#4179)"); } /* Verify LAC */ |