@@ -910,18 +910,24 @@ func TestAddWithDiffVersionNoSumCheck(t *testing.T) {
910
910
assert .Equal (t , utils .DirExists (pkgWithSumCheckPathModLock ), false )
911
911
912
912
modContent , err := os .ReadFile (pkgWithSumCheckPathMod )
913
+ modContentStr := strings .ReplaceAll (string (modContent ), "\r \n " , "" )
914
+ modContentStr = strings .ReplaceAll (string (modContentStr ), "\n " , "" )
913
915
assert .Equal (t , err , nil )
914
916
modExpectContent , err := os .ReadFile (pkgWithSumCheckPathModExpect )
917
+ modExpectContentStr := strings .ReplaceAll (string (modExpectContent ), "\r \n " , "" )
918
+ modExpectContentStr = strings .ReplaceAll (modExpectContentStr , "\n " , "" )
915
919
assert .Equal (t , err , nil )
916
- assert .Equal (t , string ( modContent ), string ( modExpectContent ) )
920
+ assert .Equal (t , modContentStr , modExpectContentStr )
917
921
918
922
opts .NoSumCheck = false
919
923
_ , err = kpmcli .AddDepWithOpts (kclPkg , & opts )
920
924
assert .Equal (t , err , nil )
921
925
assert .Equal (t , utils .DirExists (pkgWithSumCheckPathModLock ), true )
922
926
modContent , err = os .ReadFile (pkgWithSumCheckPathMod )
927
+ modContentStr = strings .ReplaceAll (string (modContent ), "\r \n " , "" )
928
+ modContentStr = strings .ReplaceAll (modContentStr , "\n " , "" )
923
929
assert .Equal (t , err , nil )
924
- assert .Equal (t , string ( modContent ), string ( modExpectContent ) )
930
+ assert .Equal (t , modContentStr , modExpectContentStr )
925
931
926
932
defer func () {
927
933
_ = os .Remove (pkgWithSumCheckPathMod )
@@ -966,16 +972,26 @@ func TestAddWithDiffVersionWithSumCheck(t *testing.T) {
966
972
assert .Equal (t , err , nil )
967
973
968
974
modContent , err := os .ReadFile (pkgWithSumCheckPathMod )
975
+ modContentStr := strings .ReplaceAll (string (modContent ), "\r \n " , "" )
976
+ modContentStr = strings .ReplaceAll (modContentStr , "\n " , "" )
969
977
assert .Equal (t , err , nil )
978
+
970
979
modExpectContent , err := os .ReadFile (pkgWithSumCheckPathModExpect )
980
+ modExpectContentStr := strings .ReplaceAll (string (modExpectContent ), "\r \n " , "" )
981
+ modExpectContentStr = strings .ReplaceAll (modExpectContentStr , "\n " , "" )
982
+
971
983
assert .Equal (t , err , nil )
972
- assert .Equal (t , string ( modContent ), string ( modExpectContent ) )
984
+ assert .Equal (t , modContentStr , modExpectContentStr )
973
985
974
986
modLockContent , err := os .ReadFile (pkgWithSumCheckPathModLock )
987
+ modLockContentStr := strings .ReplaceAll (string (modLockContent ), "\r \n " , "" )
988
+ modLockContentStr = strings .ReplaceAll (modLockContentStr , "\n " , "" )
975
989
assert .Equal (t , err , nil )
976
990
modLockExpectContent , err := os .ReadFile (pkgWithSumCheckPathModLockExpect )
991
+ modLockExpectContentStr := strings .ReplaceAll (string (modLockExpectContent ), "\r \n " , "" )
992
+ modLockExpectContentStr = strings .ReplaceAll (modLockExpectContentStr , "\n " , "" )
977
993
assert .Equal (t , err , nil )
978
- assert .Equal (t , string ( modLockContent ), string ( modLockExpectContent ) )
994
+ assert .Equal (t , modLockContentStr , modLockExpectContentStr )
979
995
980
996
defer func () {
981
997
_ = os .Remove (pkgWithSumCheckPathMod )
0 commit comments