Commit 5332ffd

authored

Fix regression: do not crash on board list if a discovery is not properly installed (#1814)

* Added tests for #1669 * Fixed regession in discoveries startup Fix #1669

1 parent 436f0bb commit 5332ffdCopy full SHA for 5332ffd

File tree

+29

-7

lines changed

+29

-7

lines changed

Lines changed: 10 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -247,29 +247,32 @@ func (disc *PluggableDiscovery) runProcess() error {`
`247`	`247`	`return err`
`248`	`248`	`}`
`249`	`249`	`disc.outgoingCommandsPipe = stdin`
`250`		`- disc.process = proc`
`251`	`250`
`252`	`251`	`messageChan := make(chan *discoveryMessage)`
`253`	`252`	`disc.incomingMessagesChan = messageChan`
`254`	`253`	`go disc.jsonDecodeLoop(stdout, messageChan)`
`255`	`254`
`256`		`- if err := disc.process.Start(); err != nil {`
	`255`	`+ if err := proc.Start(); err != nil {`
`257`	`256`	`return err`
`258`	`257`	`}`
	`258`	`+`
`259`	`259`	`disc.statusMutex.Lock()`
`260`	`260`	`defer disc.statusMutex.Unlock()`
	`261`	`+ disc.process = proc`
`261`	`262`	`disc.state = Alive`
`262`	`263`	`logrus.Infof("started discovery %s process", disc.id)`
`263`	`264`	`return nil`
`264`	`265`	`}`
`265`	`266`
`266`	`267`	`func (disc *PluggableDiscovery) killProcess() error {`
`267`	`268`	`logrus.Infof("killing discovery %s process", disc.id)`
`268`		`- if err := disc.process.Kill(); err != nil {`
`269`		`- return err`
`270`		`- }`
`271`		`- if err := disc.process.Wait(); err != nil {`
`272`		`- return err`
	`269`	`+ if disc.process != nil {`
	`270`	`+ if err := disc.process.Kill(); err != nil {`
	`271`	`+ return err`
	`272`	`+ }`
	`273`	`+ if err := disc.process.Wait(); err != nil {`
	`274`	`+ return err`
	`275`	`+ }`
`273`	`276`	`}`
`274`	`277`	`disc.statusMutex.Lock()`
`275`	`278`	`defer disc.statusMutex.Unlock()`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`# a commercial license, send an email to license@arduino.cc.`
`15`	`15`	`from pathlib import Path`
`16`	`16`	`from git import Repo`
	`17`	`+import os`
	`18`	`+import glob`
`17`	`19`	`import simplejson as json`
`18`	`20`	`import semver`
`19`	`21`	`import pytest`
`@@ -405,6 +407,23 @@ def test_board_list(run_command):`
`405`	`407`	`assert "protocol_label" in port["port"]`
`406`	`408`
`407`	`409`
	`410`	`+def test_board_list_with_invalid_discovery(run_command, data_dir):`
	`411`	`+ run_command(["core", "update-index"])`
	`412`	`+ result = run_command(["board", "list"])`
	`413`	`+ assert result.ok`
	`414`	`+`
	`415`	`+ # check that the CLI do no crash if an invalid discovery is installed`
	`416`	`+ # (for example if the installation fails midway).`
	`417`	`+ # https://github.com/arduino/arduino-cli/issues/1669`
	`418`	`+ tool_dir = os.path.join(data_dir, "packages", "builtin", "tools", "serial-discovery")`
	`419`	`+ for file_to_delete in glob.glob(tool_dir + "//"):`
	`420`	`+ os.remove(file_to_delete)`
	`421`	`+`
	`422`	`+ result = run_command(["board", "list"])`
	`423`	`+ assert result.ok`
	`424`	`+ assert "builtin:serial-discovery" in result.stderr`
	`425`	`+`
	`426`	`+`
`408`	`427`	`def test_board_listall(run_command):`
`409`	`428`	`assert run_command(["update"])`
`410`	`429`	`assert run_command(["core", "install", "arduino:avr@1.8.3"])`

Comments

(0)