Change in ...osmo-ttcn3-hacks[master]: Revert "bts: f_init_pcu: sleep before connect"

[osmith]

osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15401 )

Change subject: Revert "bts: f_init_pcu: sleep before connect"
......................................................................

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
---
M bts/BTS_Tests.ttcn
1 file changed, 3 insertions(+), 4 deletions(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 15948a3..2c11ca2 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -324,9 +324,6 @@
 		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 @@
 	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 */

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15401
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I2115c337f4601a4614b140715323c42803b003ee
Gerrit-Change-Number: 15401
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at gnumonks.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190906/c8f6388e/attachment.htm>