Skip to content

Commit 216793e

Browse files
apply revive linter suggestion about redefines-builtin-id
1 parent b332384 commit 216793e

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

internal/integrationtest/arduino-cli.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ func (cli *ArduinoCLI) StartDaemon(verbose bool) string {
267267
cli.proc = cliProc
268268
cli.daemonAddr = "127.0.0.1:50051"
269269

270-
copy := func(dst io.Writer, src io.Reader) {
270+
_copy := func(dst io.Writer, src io.Reader) {
271271
buff := make([]byte, 1024)
272272
for {
273273
n, err := src.Read(buff)
@@ -277,8 +277,8 @@ func (cli *ArduinoCLI) StartDaemon(verbose bool) string {
277277
dst.Write([]byte(color.YellowString(string(buff[:n]))))
278278
}
279279
}
280-
go copy(os.Stdout, stdout)
281-
go copy(os.Stderr, stderr)
280+
go _copy(os.Stdout, stdout)
281+
go _copy(os.Stderr, stderr)
282282
conn, err := grpc.Dial(cli.daemonAddr, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock())
283283
cli.t.NoError(err)
284284
cli.daemonConn = conn

internal/integrationtest/core/core_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ func TestCoreListAllManuallyInstalledCore(t *testing.T) {
464464
stdout, _, err := cli.Run("core", "list", "--all", "--format", "json")
465465
require.NoError(t, err)
466466
requirejson.NotEmpty(t, stdout)
467-
len, err := strconv.Atoi(requirejson.Parse(t, stdout).Query("length").String())
467+
length, err := strconv.Atoi(requirejson.Parse(t, stdout).Query("length").String())
468468
require.NoError(t, err)
469469

470470
// Manually installs a core in sketchbooks hardware folder
@@ -479,7 +479,7 @@ func TestCoreListAllManuallyInstalledCore(t *testing.T) {
479479
// Verifies manually installed core is shown
480480
stdout, _, err = cli.Run("core", "list", "--all", "--format", "json")
481481
require.NoError(t, err)
482-
requirejson.Len(t, stdout, len+1)
482+
requirejson.Len(t, stdout, length+1)
483483
requirejson.Contains(t, stdout, `[
484484
{
485485
"id": "arduino-beta-development:avr",
@@ -500,7 +500,7 @@ func TestCoreListUpdatableAllFlags(t *testing.T) {
500500
stdout, _, err := cli.Run("core", "list", "--all", "--updatable", "--format", "json")
501501
require.NoError(t, err)
502502
requirejson.NotEmpty(t, stdout)
503-
len, err := strconv.Atoi(requirejson.Parse(t, stdout).Query("length").String())
503+
length, err := strconv.Atoi(requirejson.Parse(t, stdout).Query("length").String())
504504
require.NoError(t, err)
505505

506506
// Manually installs a core in sketchbooks hardware folder
@@ -515,7 +515,7 @@ func TestCoreListUpdatableAllFlags(t *testing.T) {
515515
// Verifies using both --updatable and --all flags --all takes precedence
516516
stdout, _, err = cli.Run("core", "list", "--all", "--updatable", "--format", "json")
517517
require.NoError(t, err)
518-
requirejson.Len(t, stdout, len+1)
518+
requirejson.Len(t, stdout, length+1)
519519
requirejson.Contains(t, stdout, `[
520520
{
521521
"id": "arduino-beta-development:avr",

internal/integrationtest/upload/upload_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ func detectedBoards(t *testing.T, cli *integrationtest.ArduinoCLI) []board {
4848
var boards []board
4949
stdout, _, err := cli.Run("board", "list", "--format", "json")
5050
require.NoError(t, err)
51-
len, err := strconv.Atoi(requirejson.Parse(t, stdout).Query(".[] | .matching_boards | length").String())
51+
length, err := strconv.Atoi(requirejson.Parse(t, stdout).Query(".[] | .matching_boards | length").String())
5252
require.NoError(t, err)
53-
for i := 0; i < len; i++ {
53+
for i := 0; i < length; i++ {
5454
fqbn := strings.Trim(requirejson.Parse(t, stdout).Query(".[] | .matching_boards | .["+fmt.Sprint(i)+"] | .fqbn").String(), "\"")
5555
boards = append(boards, board{
5656
address: strings.Trim(requirejson.Parse(t, stdout).Query(".[] | .port | .address").String(), "\""),
@@ -69,10 +69,10 @@ func waitForBoard(t *testing.T, cli *integrationtest.ArduinoCLI) {
6969
for time.Now().Unix() < timeEnd {
7070
stdout, _, err := cli.Run("board", "list", "--format", "json")
7171
require.NoError(t, err)
72-
len, err := strconv.Atoi(requirejson.Parse(t, stdout).Query("length").String())
72+
length, err := strconv.Atoi(requirejson.Parse(t, stdout).Query("length").String())
7373
require.NoError(t, err)
7474
numBoards := 0
75-
for i := 0; i < len; i++ {
75+
for i := 0; i < length; i++ {
7676
numBoards, err = strconv.Atoi(requirejson.Parse(t, stdout).Query(".[] | .matching_boards | length").String())
7777
require.NoError(t, err)
7878
if numBoards > 0 {

0 commit comments

Comments
 (0)