fix: fix windows case

Signed-off-by: zongz <zongzhe1024@163.com>
kcl-lang · Nov 13, 2023 · 6ff8bca · 6ff8bca
1 parent 585e50f
commit 6ff8bca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go
@@ -8,6 +8,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 
 	"github.com/otiai10/copy"
@@ -711,15 +712,15 @@ func TestUpdateWithKclMod(t *testing.T) {
 	expected_content, err := os.ReadFile(expected_path)
 
 	assert.Equal(t, err, nil)
-	assert.Equal(t, string(got_content), string(expected_content))
+	expect := strings.ReplaceAll(string(expected_content), "\r\n", "\n")
+	assert.Equal(t, string(got_content), expect)
 
 	defer func() {
 		err := os.RemoveAll(dest_testDir)
 		assert.Equal(t, err, nil)
 	}()
 }
 
-
 func TestUpdateWithKclModlock(t *testing.T) {
 	kpmcli, err := NewKpmClient()
 	assert.Equal(t, err, nil)
@@ -748,4 +749,4 @@ func TestUpdateWithKclModlock(t *testing.T) {
 		err := os.RemoveAll(dest_testDir)
 		assert.Equal(t, err, nil)
 	}()
-}
+}
diff --git a/test/e2e/kpm_test.go b/test/e2e/kpm_test.go
@@ -232,7 +232,7 @@ var _ = ginkgo.Describe("Kpm CLI Testing", func() {
 				gomega.Expect(manifest_expect.Annotations[constants.DEFAULT_KCL_OCI_MANIFEST_NAME]).To(gomega.Equal("kcl2"))
 				gomega.Expect(manifest_expect.Annotations[constants.DEFAULT_KCL_OCI_MANIFEST_VERSION]).To(gomega.Equal("0.0.1"))
 				gomega.Expect(manifest_expect.Annotations[constants.DEFAULT_KCL_OCI_MANIFEST_DESCRIPTION]).To(gomega.Equal("This is the kcl package named kcl2"))
-				gomega.Expect(manifest_expect.Annotations[constants.DEFAULT_KCL_OCI_MANIFEST_SUM]).To(gomega.Equal("zQ7PTOcJi4gzXqypCWML6bsjToQU+E9Q2WZw/N3WnNY="))
+				gomega.Expect(manifest_expect.Annotations[constants.DEFAULT_KCL_OCI_MANIFEST_SUM]).To(gomega.Equal("Y/QXruiaxcJcmOnKWl4UEFuUqKTtbi4jTTeuEjeGV8s="))
 			})
 		}
 	})