OrgGo
/
shirou_gopsutil
mirror of https://hub.fastgit.org/shirou/gopsutil.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix new line problem on Windows

This commit is contained in:
WAKAYAMA Shirou 2015-02-12 22:34:00 +09:00
parent 3907a842a7
commit 69ad6a7822
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/common.go
View File

@ -113,7 +113,7 @@ func mustParseFloat64(val string) float64 {
// Check the target string slice containes src or not // Check the target string slice containes src or not
func StringContains(target []string, src string) bool { func StringContains(target []string, src string) bool {
for _, t := range target { for _, t := range target {
if t == src { if strings.TrimSpace(t) == src {
return true return true
} }
} }

5
common/common_test.go
View File

@ -2,6 +2,7 @@ package common
import ( import (
"fmt" "fmt"
"strings"
"testing" "testing"
) )
@ -10,7 +11,7 @@ func TestReadlines(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
if ret[0] != "package common" { if !strings.Contains(ret[0], "package common") {
t.Error("could not read correctly") t.Error("could not read correctly")
} }
} }
@ -21,7 +22,7 @@ func TestReadLinesOffsetN(t *testing.T) {
t.Error(err) t.Error(err)
} }
fmt.Println(ret[0]) fmt.Println(ret[0])
if ret[0] != `import (` { if !strings.Contains(ret[0], `import (`) {
t.Error("could not read correctly") t.Error("could not read correctly")
} }
} }