fix: fix windows test

Signed-off-by: zongz <zongzhe1024@163.com>
kcl-lang · Mar 13, 2024 · d923f27 · d923f27
1 parent 2489510
commit d923f27
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 8 deletions.
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -1370,7 +1370,13 @@ func check(dep pkg.Dependency, newDepPath string) bool {
 // On the windows system, it will create a junction.
 func createDepRef(depName, refName string) error {
 	if runtime.GOOS == "windows" {
-		return copy.Copy(depName, refName)
+		// 'go-getter' continuously occupies files in '.git', causing the copy operation to fail
+		opt := copy.Options{
+			Skip: func(srcinfo os.FileInfo, src, dest string) (bool, error) {
+				return filepath.Base(src) == constants.GitPathSuffix, nil
+			},
+		}
+		return copy.Copy(depName, refName, opt)
 	} else {
 		return utils.CreateSymlink(depName, refName)
 	}

diff --git a/pkg/client/test_data/add_with_git_commit/test_pkg/kcl.mod.lock.expect b/pkg/client/test_data/add_with_git_commit/test_pkg/kcl.mod.lock.expect
@@ -3,6 +3,6 @@
     name = "catalog"
     full_name = "catalog_a29e3db"
     version = "a29e3db"
-    sum = "kFmlrYJbJUFFTEXjC9cquc80WB+UpZ/6oMPKrfgyeks="
+    sum = "zhh1yHk5TrNi9apHUQF3hPOlwi5Kc75cNHjcVmGv+Qo="
     url = "https://github.com/KusionStack/catalog.git"
     commit = "a29e3db"
diff --git a/pkg/client/test_data/resolve_metadata/kcl.mod.lock b/pkg/client/test_data/resolve_metadata/kcl.mod.lock
@@ -3,6 +3,6 @@
     name = "konfig"
     full_name = "konfig_v0.0.1"
     version = "v0.0.1"
-    sum = "XFvHdBAoY/+qpJWmj8cjwOwZO8a3nX/7SE35cTxQOFU="
+    sum = "bcUvvcR21AFUE/Zf63wx6HkqzFYH1vihmE+SCd8OOCs="
     url = "https://github.com/awesome-kusion/konfig.git"
     git_tag = "v0.0.1"
diff --git a/pkg/client/test_data/test_init_empty_mod/kcl.mod b/pkg/client/test_data/test_init_empty_mod/kcl.mod
@@ -1,5 +1,5 @@
 [package]
 name = "test_name"
-edition = "0.0.1"
+edition = "v0.7.0"
 version = "0.0.1"
 
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -3,6 +3,7 @@ package constants
 const (
 	KFilePathSuffix                      = ".k"
 	TarPathSuffix                        = ".tar"
+	GitPathSuffix                        = ".git"
 	OciScheme                            = "oci"
 	FileEntry                            = "file"
 	FileWithKclModEntry                  = "file_with_kcl_mod"

diff --git a/pkg/git/git_test.go b/pkg/git/git_test.go
@@ -3,6 +3,7 @@ package git
 import (
 	"bytes"
 	"os"
+	"path/filepath"
 	"testing"
 
 	"gotest.tools/v3/assert"
@@ -48,6 +49,7 @@ func TestCloneWithOptions(t *testing.T) {
 	var buf bytes.Buffer
 
 	tmpdir, err := os.MkdirTemp("", "git")
+	tmpdir = filepath.Join(tmpdir, "git")
 	assert.Equal(t, err, nil)
 	defer func() {
 		rErr := os.RemoveAll(tmpdir)

diff --git a/test/e2e/test_suites/test_data/test_kpm_metadata_with_commit_dep/kcl.mod.lock b/test/e2e/test_suites/test_data/test_kpm_metadata_with_commit_dep/kcl.mod.lock
@@ -3,6 +3,6 @@
     name = "catalog"
     full_name = "catalog_c5435e733"
     version = "c5435e733"
-    sum = "kFmlrYJbJUFFTEXjC9cquc80WB+UpZ/6oMPKrfgyeks="
+    sum = "zhh1yHk5TrNi9apHUQF3hPOlwi5Kc75cNHjcVmGv+Qo="
     url = "https://github.com/KusionStack/catalog.git"
     commit = "c5435e733"
diff --git a/test/e2e/test_suites/test_data/test_kpm_run_with_git_commit_dep/kcl.mod.lock b/test/e2e/test_suites/test_data/test_kpm_run_with_git_commit_dep/kcl.mod.lock
@@ -3,6 +3,6 @@
     name = "catalog"
     full_name = "catalog_a29e3db"
     version = "a29e3db"
-    sum = "kFmlrYJbJUFFTEXjC9cquc80WB+UpZ/6oMPKrfgyeks="
+    sum = "zhh1yHk5TrNi9apHUQF3hPOlwi5Kc75cNHjcVmGv+Qo="
     url = "https://github.com/KusionStack/catalog.git"
     commit = "a29e3db"
diff --git a/test/e2e/test_suites/test_data/test_kpm_run_with_git_commit_dep_1/kcl.mod.lock b/test/e2e/test_suites/test_data/test_kpm_run_with_git_commit_dep_1/kcl.mod.lock
@@ -3,6 +3,6 @@
     name = "catalog"
     full_name = "catalog_a29e3db"
     version = "a29e3db"
-    sum = "kFmlrYJbJUFFTEXjC9cquc80WB+UpZ/6oMPKrfgyeks="
+    sum = "zhh1yHk5TrNi9apHUQF3hPOlwi5Kc75cNHjcVmGv+Qo="
     url = "https://github.com/KusionStack/catalog.git"
     commit = "a29e3db"
diff --git a/test/e2e/test_suites/test_data/test_kpm_run_with_git_commit_dep_1/sub/kcl.mod.lock b/test/e2e/test_suites/test_data/test_kpm_run_with_git_commit_dep_1/sub/kcl.mod.lock
@@ -3,6 +3,6 @@
     name = "catalog"
     full_name = "catalog_a29e3db"
     version = "a29e3db"
-    sum = "kFmlrYJbJUFFTEXjC9cquc80WB+UpZ/6oMPKrfgyeks="
+    sum = "zhh1yHk5TrNi9apHUQF3hPOlwi5Kc75cNHjcVmGv+Qo="
     url = "https://github.com/KusionStack/catalog.git"
     commit = "a29e3db"