updated tests and fixed some error wording

Author: cmaglie

commands/board/attach.go

@@ -46,7 +46,7 @@ func Attach(ctx context.Context, req *rpc.BoardAttachRequest, taskCB commands.Ta
 	}
 	sk, err := sketch.New(sketchPath)
 	if err != nil {
-		return nil, &commands.SketchNotFoundError{Cause: err}
+		return nil, &commands.CantOpenSketchError{Cause: err}
 	}
 
 	boardURI := req.GetBoardUri()

commands/compile/compile.go

@@ -99,7 +99,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 	sketchPath := paths.New(req.GetSketchPath())
 	sk, err := sketch.New(sketchPath)
 	if err != nil {
-		return nil, &commands.SketchNotFoundError{Cause: err}
+		return nil, &commands.CantOpenSketchError{Cause: err}
 	}
 
 	fqbnIn := req.GetFqbn()

commands/debug/debug_info.go

@@ -44,7 +44,7 @@ func getDebugProperties(req *debug.DebugConfigRequest, pm *packagemanager.Packag
 	sketchPath := paths.New(req.GetSketchPath())
 	sk, err := sketch.New(sketchPath)
 	if err != nil {
-		return nil, &commands.SketchNotFoundError{Cause: err}
+		return nil, &commands.CantOpenSketchError{Cause: err}
 	}
 
 	// XXX Remove this code duplication!!

commands/errors.go

@@ -304,20 +304,20 @@ func (e *MissingSketchPathError) ToRPCStatus() *status.Status {
 	return status.New(codes.InvalidArgument, e.Error())
 }
 
-// SketchNotFoundError is returned when the sketch is not found
-type SketchNotFoundError struct {
+// CantOpenSketchError is returned when the sketch is not found or cannot be opened
+type CantOpenSketchError struct {
 	Cause error
 }
 
-func (e *SketchNotFoundError) Error() string {
-	return composeErrorMsg(tr("Sketch not found"), e.Cause)
+func (e *CantOpenSketchError) Error() string {
+	return composeErrorMsg(tr("Can't open sketch"), e.Cause)
 }
 
-func (e *SketchNotFoundError) Unwrap() error {
+func (e *CantOpenSketchError) Unwrap() error {
 	return e.Cause
 }
 
-func (e *SketchNotFoundError) ToRPCStatus() *status.Status {
+func (e *CantOpenSketchError) ToRPCStatus() *status.Status {
 	return status.New(codes.NotFound, e.Error())
 }
 

commands/instances.go

@@ -862,7 +862,7 @@ func LoadSketch(ctx context.Context, req *rpc.LoadSketchRequest) (*rpc.LoadSketc
 	// TODO: This should be a ToRpc function for the Sketch struct
 	sketch, err := sk.New(paths.New(req.SketchPath))
 	if err != nil {
-		return nil, &SketchNotFoundError{Cause: err}
+		return nil, &CantOpenSketchError{Cause: err}
 	}
 
 	otherSketchFiles := make([]string, sketch.OtherSketchFiles.Len())

commands/sketch/archive.go

@@ -43,7 +43,7 @@ func ArchiveSketch(ctx context.Context, req *rpc.ArchiveSketchRequest) (*rpc.Arc
 
 	s, err := sketch.New(sketchPath)
 	if err != nil {
-		return nil, &commands.SketchNotFoundError{Cause: err}
+		return nil, &commands.CantOpenSketchError{Cause: err}
 	}
 
 	sketchPath = s.FullPath

commands/upload/upload.go

@@ -123,7 +123,7 @@ func Upload(ctx context.Context, req *rpc.UploadRequest, outStream io.Writer, er
 	sketchPath := paths.New(req.GetSketchPath())
 	sk, err := sketch.New(sketchPath)
 	if err != nil && req.GetImportDir() == "" && req.GetImportFile() == "" {
-		return nil, &commands.SketchNotFoundError{Cause: err}
+		return nil, &commands.CantOpenSketchError{Cause: err}
 	}
 
 	pm := commands.GetPackageManager(req.GetInstance().GetId())

test/conftest.py

@@ -141,7 +141,7 @@ def _run(cmd_string, custom_working_dir=None, custom_env=None):
         # It escapes spaces in the path using "\ " but it doesn't always work,
         # wrapping the path in quotation marks is the safest approach
         with run_context.prefix(f'{cd_command} "{custom_working_dir}"'):
-            return run_context.run(cli_full_line, echo=False, hide=True, warn=True, env=custom_env, encoding="utf-8")
+            return run_context.run(cli_full_line, echo=False, hide=False, warn=True, env=custom_env, encoding="utf-8")
 
     return _run
 

test/pytest.ini

@@ -14,4 +14,4 @@ markers =
 # -n=auto sets the numbers of parallel processes to use
 # --dist=loadfile distributes the tests in the parallel processes dividing them per file
 # See https://pypi.org/project/pytest-xdist/#parallelization for more info on parallelization
-addopts = -x -s --verbose --tb=long -n=auto --dist=loadfile
+addopts = -x -s --verbose 

test/test_board.py

@@ -528,7 +528,7 @@ def test_board_details_no_flags(run_command):
     run_command("core install arduino:[email protected]")
     result = run_command("board details")
     assert not result.ok
-    assert "Error getting board details: parsing fqbn: invalid fqbn:" in result.stderr
+    assert "Error getting board details: Invalid FQBN:" in result.stderr
     assert result.stdout == ""