Skip to content

Commit deb86e0

Browse files
committed
fix: replace newline for test case on windows
Signed-off-by: zongz <zongzhe1024@163.com>
1 parent 59603b4 commit deb86e0

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

pkg/client/client_test.go

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -910,18 +910,24 @@ func TestAddWithDiffVersionNoSumCheck(t *testing.T) {
910910
assert.Equal(t, utils.DirExists(pkgWithSumCheckPathModLock), false)
911911

912912
modContent, err := os.ReadFile(pkgWithSumCheckPathMod)
913+
modContentStr := strings.ReplaceAll(string(modContent), "\r\n", "")
914+
modContentStr = strings.ReplaceAll(string(modContentStr), "\n", "")
913915
assert.Equal(t, err, nil)
914916
modExpectContent, err := os.ReadFile(pkgWithSumCheckPathModExpect)
917+
modExpectContentStr := strings.ReplaceAll(string(modExpectContent), "\r\n", "")
918+
modExpectContentStr = strings.ReplaceAll(modExpectContentStr, "\n", "")
915919
assert.Equal(t, err, nil)
916-
assert.Equal(t, string(modContent), string(modExpectContent))
920+
assert.Equal(t, modContentStr, modExpectContentStr)
917921

918922
opts.NoSumCheck = false
919923
_, err = kpmcli.AddDepWithOpts(kclPkg, &opts)
920924
assert.Equal(t, err, nil)
921925
assert.Equal(t, utils.DirExists(pkgWithSumCheckPathModLock), true)
922926
modContent, err = os.ReadFile(pkgWithSumCheckPathMod)
927+
modContentStr = strings.ReplaceAll(string(modContent), "\r\n", "")
928+
modContentStr = strings.ReplaceAll(modContentStr, "\n", "")
923929
assert.Equal(t, err, nil)
924-
assert.Equal(t, string(modContent), string(modExpectContent))
930+
assert.Equal(t, modContentStr, modExpectContentStr)
925931

926932
defer func() {
927933
_ = os.Remove(pkgWithSumCheckPathMod)
@@ -966,16 +972,26 @@ func TestAddWithDiffVersionWithSumCheck(t *testing.T) {
966972
assert.Equal(t, err, nil)
967973

968974
modContent, err := os.ReadFile(pkgWithSumCheckPathMod)
975+
modContentStr := strings.ReplaceAll(string(modContent), "\r\n", "")
976+
modContentStr = strings.ReplaceAll(modContentStr, "\n", "")
969977
assert.Equal(t, err, nil)
978+
970979
modExpectContent, err := os.ReadFile(pkgWithSumCheckPathModExpect)
980+
modExpectContentStr := strings.ReplaceAll(string(modExpectContent), "\r\n", "")
981+
modExpectContentStr = strings.ReplaceAll(modExpectContentStr, "\n", "")
982+
971983
assert.Equal(t, err, nil)
972-
assert.Equal(t, string(modContent), string(modExpectContent))
984+
assert.Equal(t, modContentStr, modExpectContentStr)
973985

974986
modLockContent, err := os.ReadFile(pkgWithSumCheckPathModLock)
987+
modLockContentStr := strings.ReplaceAll(string(modLockContent), "\r\n", "")
988+
modLockContentStr = strings.ReplaceAll(modLockContentStr, "\n", "")
975989
assert.Equal(t, err, nil)
976990
modLockExpectContent, err := os.ReadFile(pkgWithSumCheckPathModLockExpect)
991+
modLockExpectContentStr := strings.ReplaceAll(string(modLockExpectContent), "\r\n", "")
992+
modLockExpectContentStr = strings.ReplaceAll(modLockExpectContentStr, "\n", "")
977993
assert.Equal(t, err, nil)
978-
assert.Equal(t, string(modLockContent), string(modLockExpectContent))
994+
assert.Equal(t, modLockContentStr, modLockExpectContentStr)
979995

980996
defer func() {
981997
_ = os.Remove(pkgWithSumCheckPathMod)

0 commit comments

Comments
 (0)