Commit 87561fe

cmaglieper1234

and

committed

Apply suggestions from code review

Co-authored-by: per1234 <accounts@perglass.com>

1 parent 82e47d3 commit 87561feCopy full SHA for 87561fe

File tree

4 files changed

-19

lines changed

Taskfile.yml
internal/integrationtest
- arduino-cli.go
- core
  - core_test.go
- daemon
  - daemon_compile_test.go

4 files changed

-19

lines changed

`‎Taskfile.yml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ tasks:`
`90`	`90`
`91`	`91`	`# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/test-go-task/Taskfile.yml`
`92`	`92`	`go:test:`
`93`		`- desc: Run unit tests and part of the integration tests`
	`93`	`+ desc: Run unit tests and the Go-based integration tests`
`94`	`94`	`deps:`
`95`	`95`	`- task: go:build`
`96`	`96`	`dir: '{{default "./" .GO_MODULE_PATH}}'`

`‎internal/integrationtest/arduino-cli.go‎`

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func NewArduinoCliWithinEnvironment(env testsuite.Environment, config ArduinoC`
`61`	`61`	`cli := &ArduinoCLI{`
`62`	`62`	`path: config.ArduinoCLIPath,`
`63`	`63`	`t: require.New(env.T()),`
`64`		`- dataDir: env.RootDir().Join("arduino15"),`
	`64`	`+ dataDir: env.RootDir().Join("Arduino15"),`
`65`	`65`	`sketchbookDir: env.RootDir().Join("Arduino"),`
`66`	`66`	`stagingDir: env.RootDir().Join("arduino15/staging"),`
`67`	`67`	`}`
`@@ -153,14 +153,6 @@ func (cli *ArduinoCLI) StartDaemon(verbose bool) string {`
`153`	`153`
`154`	`154`	`cli.t.NoError(cliProc.Start())`
`155`	`155`	`cli.proc = cliProc`
`156`		`-`
`157`		`- // var daemonAddr struct {`
`158`		`- // IP string`
`159`		`- // Port string`
`160`		`- // }`
`161`		`- // dec := json.NewDecoder(stdout)`
`162`		`- // cli.t.NoError(dec.Decode(&daemonAddr))`
`163`		`- // cli.daemonAddr = daemonAddr.IP + ":" + daemonAddr.Port`
`164`	`156`	`cli.daemonAddr = "127.0.0.1:50051"`
`165`	`157`
`166`	`158`	`copy := func(dst io.Writer, src io.Reader) {`

`‎internal/integrationtest/core/core_test.go‎`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ func TestCoreSearch(t *testing.T) {`
`62`	`62`	`out, _, err = cli.Run("core", "search", "test_core", "--all", "--format", "json", "--additional-urls="+url.String())`
`63`	`63`	`require.NoError(t, err)`
`64`	`64`	`requirejson.Len(t, out, 2)`
`65`		`- // requirejson.Len(t, out, 3) // Test failure`
`66`	`65`
`67`	`66`	`checkPlatformIsInJSONOutput := func(stdout []byte, id, version string) {`
`68`	`67`	jqquery := fmt.Sprintf(`[{id:"%s", latest:"%s"}]`, id, version)
`@@ -74,7 +73,6 @@ func TestCoreSearch(t *testing.T) {`
`74`	`73`	`require.NoError(t, err)`
`75`	`74`	`checkPlatformIsInJSONOutput(out, "Retrokits-RK002:arm", "1.0.5")`
`76`	`75`	`checkPlatformIsInJSONOutput(out, "Retrokits-RK002:arm", "1.0.6")`
`77`		`- //checkPlatformIsInJSONOutput(out, "Retrokits-RK002:arm", "1.0.9") // Test failure`
`78`	`76`
`79`	`77`	`// Search using Retrokit Package Maintainer`
`80`	`78`	`out, _, err = cli.Run("core", "search", "Retrokits-RK002", "--all", "--additional-urls="+url.String(), "--format", "json")`
`@@ -93,7 +91,6 @@ func TestCoreSearch(t *testing.T) {`
`93`	`91`	`require.NoError(t, err)`
`94`	`92`	`checkPlatformIsInJSONOutput(out, "Package:x86", "1.2.3")`
`95`	`93`
`96`		`- // Check search with case, accents and spaces`
`97`	`94`	`runSearch := func(searchArgs string, expectedIDs ...string) {`
`98`	`95`	`args := []string{"core", "search", "--format", "json"}`
`99`	`96`	`args = append(args, strings.Split(searchArgs, " ")...)`
`@@ -106,6 +103,7 @@ func TestCoreSearch(t *testing.T) {`
`106`	`103`	`}`
`107`	`104`	`}`
`108`	`105`
	`106`	`+ // Check search with case, accents and spaces`
`109`	`107`	`runSearch("mkr1000", "arduino:samd")`
`110`	`108`	`runSearch("mkr 1000", "arduino:samd")`
`111`	`109`

`‎internal/integrationtest/daemon/daemon_compile_test.go‎`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,6 @@ func TestDaemonCompileOptions(t *testing.T) {`
`74`	`74`	`fmt.Println("COMPILE ERROR>", err)`
`75`	`75`	`break`
`76`	`76`	`}`
`77`		`- // if msg.OutStream != nil {`
`78`		`- // fmt.Printf("COMPILE> %v\n", string(msg.GetOutStream()))`
`79`		`- // }`
`80`	`77`	`if msg.ErrStream != nil {`
`81`	`78`	`fmt.Printf("COMPILE> %v\n", string(msg.GetErrStream()))`
`82`	`79`	`}`
`@@ -91,9 +88,6 @@ func TestDaemonCompileOptions(t *testing.T) {`
`91`	`88`	`break`
`92`	`89`	`}`
`93`	`90`	`require.NoError(t, err)`
`94`		`- // if msg.OutStream != nil {`
`95`		`- // fmt.Printf("COMPILE> %v\n", string(msg.GetOutStream()))`
`96`		`- // }`
`97`	`91`	`if msg.ErrStream != nil {`
`98`	`92`	`fmt.Printf("COMPILE> %v\n", string(msg.GetErrStream()))`
`99`	`93`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 87561fe

File tree

4 files changed

4 files changed

`‎Taskfile.yml‎`

`‎internal/integrationtest/arduino-cli.go‎`

`‎internal/integrationtest/core/core_test.go‎`

`‎internal/integrationtest/daemon/daemon_compile_test.go‎`

0 commit comments