Fixed failing test

cmaglie · cmaglie · commit 0b1c8dd9f259 · 2020-04-14T18:01:23.000+02:00
diff --git a/commands/compile/compile.go b/commands/compile/compile.go
@@ -75,7 +75,12 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 		return nil, errors.New("invalid instance")
 	}
 
-	logrus.Tracef("Compile %s for %s started", req.GetSketchPath(), req.GetFqbn())
+	boardArg := req.GetBoard()
+	if boardArg == "" {
+		boardArg = req.GetFqbn() // DEPRECATED: Keep Fqbn field working for old clients.
+	}
+
+	logrus.Tracef("Compile %s for %s started", req.GetSketchPath(), boardArg)
 	if req.GetSketchPath() == "" {
 		return nil, fmt.Errorf("missing sketchPath")
 	}
@@ -85,10 +90,6 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 		return nil, fmt.Errorf("opening sketch: %s", err)
 	}
 
-	boardArg := req.GetBoard()
-	if boardArg == "" {
-		boardArg = req.GetFqbn() // DEPRECATED: Keep Fqbn field working for old clients.
-	}
 	if boardArg == "" && sketch != nil && sketch.Metadata != nil {
 		boardArg = sketch.Metadata.CPU.Fqbn
 	}

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,12 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W`
`75`	`75`	`return nil, errors.New("invalid instance")`
`76`	`76`	`}`
`77`	`77`
`78`		`- logrus.Tracef("Compile %s for %s started", req.GetSketchPath(), req.GetFqbn())`
	`78`	`+ boardArg := req.GetBoard()`
	`79`	`+ if boardArg == "" {`
	`80`	`+ boardArg = req.GetFqbn() // DEPRECATED: Keep Fqbn field working for old clients.`
	`81`	`+ }`
	`82`	`+`
	`83`	`+ logrus.Tracef("Compile %s for %s started", req.GetSketchPath(), boardArg)`
`79`	`84`	`if req.GetSketchPath() == "" {`
`80`	`85`	`return nil, fmt.Errorf("missing sketchPath")`
`81`	`86`	`}`
`@@ -85,10 +90,6 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W`
`85`	`90`	`return nil, fmt.Errorf("opening sketch: %s", err)`
`86`	`91`	`}`
`87`	`92`
`88`		`- boardArg := req.GetBoard()`
`89`		`- if boardArg == "" {`
`90`		`- boardArg = req.GetFqbn() // DEPRECATED: Keep Fqbn field working for old clients.`
`91`		`- }`
`92`	`93`	`if boardArg == "" && sketch != nil && sketch.Metadata != nil {`
`93`	`94`	`boardArg = sketch.Metadata.CPU.Fqbn`
`94`	`95`	`}`