Fixes for stricter sca rules
Change-Id: I027796c040009ec21d9864b1868757993d47cb35
diff --git a/rw_core/core/device/flow/loader_test.go b/rw_core/core/device/flow/loader_test.go
index 958124d..536a447 100644
--- a/rw_core/core/device/flow/loader_test.go
+++ b/rw_core/core/device/flow/loader_test.go
@@ -18,8 +18,10 @@
import (
"bufio"
+ "context"
"fmt"
"os"
+ "path/filepath"
"regexp"
"strconv"
"testing"
@@ -59,17 +61,27 @@
}
func compare(regexesA, regexesB []*regexp.Regexp, fileNameA, fileNameB string) error {
- fileA, err := os.Open(fileNameA)
+ fileA, err := os.Open(filepath.Clean(fileNameA))
if err != nil {
return err
}
- defer fileA.Close()
+ defer func() {
+ err := fileA.Close()
+ if err != nil {
+ logger.Errorf(context.Background(), "failed to close file: %v", err)
+ }
+ }()
- fileB, err := os.Open(fileNameB)
+ fileB, err := os.Open(filepath.Clean(fileNameB))
if err != nil {
return err
}
- defer fileB.Close()
+ defer func() {
+ err := fileB.Close()
+ if err != nil {
+ logger.Errorf(context.Background(), "failed to close file: %v", err)
+ }
+ }()
scannerA, scannerB := bufio.NewScanner(fileA), bufio.NewScanner(fileB)