Fix monitor init handling (#2728)

* Fixed linter warn * Added integration test * Fixed monitor dead-locking package manager * Fix integration test: Allow some time for the mocked-monitor process to terminate otherwise the test will fail on Windows when the cleanup function tries to remove the executable: Error Trace: D:/a/arduino-cli/arduino-cli/internal/integrationtest/environment.go:46 D:/a/arduino-cli/arduino-cli/internal/integrationtest/environment.go:56 D:/a/arduino-cli/arduino-cli/internal/integrationtest/environment.go:56 D:/a/arduino-cli/arduino-cli/internal/integrationtest/environment.go:62 D:/a/arduino-cli/arduino-cli/internal/integrationtest/daemon/daemon_concurrency_test.go:127 Error: Received unexpected error: remove C:\Users\runneradmin\AppData\Local\Temp\cli2489057723\A\packages\builtin\tools\serial-monitor\0.14.1\serial-monitor.exe: Access is denied. Test: TestInitAndMonitorConcurrency

Author: cmaglie

commands/service_monitor.go

@@ -125,8 +125,8 @@ func (s *arduinoCoreServerImpl) Monitor(stream rpc.ArduinoCoreService_MonitorSer
 iferr!=nil {
 returnerr
  }
-deferrelease()
 monitor, boardSettings, err:=findMonitorAndSettingsForProtocolAndBoard(pme, openReq.GetPort().GetProtocol(), openReq.GetFqbn())
+release()
 iferr!=nil {
 returnerr
  }

internal/cli/daemon/daemon.go

@@ -35,7 +35,6 @@ import (
 )
 
 var (
-tr=i18n.Tr
 daemonizebool
 debugbool
 debugFilestring

internal/integrationtest/daemon/daemon_concurrency_test.go

@@ -20,6 +20,7 @@ import (
 "errors"
 "fmt"
 "io"
+"sync"
 "testing"
 "time"
 
@@ -76,3 +77,56 @@ func TestArduinoCliDaemonCompileWithLotOfOutput(t *testing.T) {
 testCompile()
 testCompile()
 }
+
+funcTestInitAndMonitorConcurrency(t*testing.T) {
+// See: https://github.com/arduino/arduino-cli/issues/2719
+
+env, cli:=integrationtest.CreateEnvForDaemon(t)
+deferenv.CleanUp()
+
+_, _, err:=cli.Run("core", "install", "arduino:avr")
+require.NoError(t, err)
+
+grpcInst:=cli.Create()
+require.NoError(t, grpcInst.Init("", "", func(ir*commands.InitResponse) {
+fmt.Printf("INIT> %v\n", ir.GetMessage())
+ }))
+
+cli.InstallMockedSerialMonitor(t)
+
+// Open the serial monitor for 5 seconds
+ctx, cancel:=context.WithTimeout(context.Background(), 5*time.Second)
+defercancel()
+mon, err:=grpcInst.Monitor(ctx, &commands.Port{
+Address: "/dev/test",
+Protocol: "serial",
+ })
+require.NoError(t, err)
+varmonitorCompleted sync.WaitGroup
+monitorCompleted.Add(1)
+gofunc() {
+for {
+msg, err:=mon.Recv()
+iferr!=nil {
+break
+ }
+fmt.Println("MON> ", msg)
+ }
+fmt.Println("MON CLOSED")
+monitorCompleted.Done()
+ }()
+
+// Check that Init completes without blocking when the monitor is open
+start:=time.Now()
+require.NoError(t, grpcInst.Init("", "", func(ir*commands.InitResponse) {
+fmt.Printf("INIT> %v\n", ir.GetMessage())
+ }))
+require.LessOrEqual(t, time.Since(start), 4*time.Second)
+cancel()
+monitorCompleted.Wait()
+
+// Allow some time for the mocked-monitor process to terminate (otherwise the
+// test will fail on Windows when the cleanup function tries to remove the
+// executable).
+time.Sleep(2*time.Second)
+}