From 446ec4b40d3bbfe50f3d434646c6f38e2f67bf7b Mon Sep 17 00:00:00 2001 From: Tamilmani Manoharan Date: Tue, 19 May 2020 15:27:53 -0700 Subject: [PATCH] fixing race in telemetry test code --- telemetry/telemetry_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/telemetry/telemetry_test.go b/telemetry/telemetry_test.go index 56b8d5ba14..ff865692c0 100644 --- a/telemetry/telemetry_test.go +++ b/telemetry/telemetry_test.go @@ -190,9 +190,12 @@ func TestSendTelemetry(t *testing.T) { func TestCloseTelemetryConnection(t *testing.T) { tb.Cancel() time.Sleep(300 * time.Millisecond) + + tb.mutex.Lock() if len(tb.connections) != 0 { t.Errorf("server didn't close connection") } + tb.mutex.Unlock() } func TestServerCloseTelemetryConnection(t *testing.T) { @@ -218,9 +221,11 @@ func TestServerCloseTelemetryConnection(t *testing.T) { t.Errorf("Client couldn't recognise server close") } + tb.mutex.Lock() if len(tb.connections) != 0 { t.Errorf("All connections not closed as expected") } + tb.mutex.Unlock() // Close client connection tb1.Close() @@ -248,9 +253,11 @@ func TestClientCloseTelemetryConnection(t *testing.T) { tb1.Close() time.Sleep(300 * time.Millisecond) + tb.mutex.Lock() if len(tb.connections) != 0 { t.Errorf("All connections not closed as expected") } + tb.mutex.Unlock() // Exit server thread and close server connection tb.Cancel()