Merge pull request #95 from merlin-northern/2.1.x-tests-timeouts

[cherry-picks] test: sudden failures: increasing timeouts.

connectionmanager/connectionmanager_test.go

@@ -1,4 +1,4 @@
-// Copyright 2021 Northern.tech AS
+// Copyright 2023 Northern.tech AS
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -27,6 +27,8 @@ import (
 	"github.com/vmihailenco/msgpack/v5"
 )
 
+const waitForWebsocketServer = 2 * time.Second
+
 func init() {
 	DefaultPingWait = 10 * time.Second
 }
@@ -94,6 +96,8 @@ func TestConnect(t *testing.T) {
 
 	_ = Close(ws.ProtoTypeShell)
 
+	time.Sleep(waitForWebsocketServer)
+
 	ctx := context.Background()
 	err := Connect(ws.ProtoTypeShell, "ws://localhost:8999", "/ws", "token", 1, ctx)
 	assert.Nil(t, err)
@@ -123,6 +127,8 @@ func TestReconnect(t *testing.T) {
 		_ = srv.Shutdown(context.Background())
 	}()
 
+	time.Sleep(waitForWebsocketServer)
+
 	_ = Close(ws.ProtoTypeShell)
 
 	ctx := context.Background()

session/portforward_test.go

@@ -1,4 +1,4 @@
-// Copyright 2021 Northern.tech AS
+// Copyright 2023 Northern.tech AS
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -218,6 +218,8 @@ func TestPortForwardHandlerSuccessfulConnection(t *testing.T) {
 		}
 	}(tcpPort)
 
+	time.Sleep(2000 * time.Millisecond)
+
 	// c1: new
 	protocol := wspf.PortForwardProtocol(wspf.PortForwardProtocolTCP)
 	remoteHost := "localhost"