fix: fix unix test

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

Hide file tree

Showing 11 changed files with 36 additions and 7 deletions.
diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go
@@ -9,6 +9,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -1186,7 +1187,13 @@ func TestAddWithDiffVersionWithSumCheck(t *testing.T) {
 func TestAddWithGitCommit(t *testing.T) {
 	pkgPath := getTestDir("add_with_git_commit")
 
-	testPkgPath := filepath.Join(pkgPath, "test_pkg")
+	testPkgPath := ""
+	if runtime.GOOS == "windows" {
+		testPkgPath = filepath.Join(pkgPath, "test_pkg_win")
+	} else {
+		testPkgPath = filepath.Join(pkgPath, "test_pkg")
+	}
+
 	testPkgPathModBak := filepath.Join(testPkgPath, "kcl.mod.bak")
 	testPkgPathMod := filepath.Join(testPkgPath, "kcl.mod")
 	testPkgPathModExpect := filepath.Join(testPkgPath, "kcl.mod.expect")
@@ -1205,7 +1212,7 @@ func TestAddWithGitCommit(t *testing.T) {
 	assert.Equal(t, err, nil)
 
 	opts := opt.AddOptions{
-		LocalPath: pkgPath,
+		LocalPath: testPkgPath,
 		RegistryOpts: opt.RegistryOptions{
 			Git: &opt.GitOptions{
 				Url:    "https://github.com/KusionStack/catalog.git",

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 = "zhh1yHk5TrNi9apHUQF3hPOlwi5Kc75cNHjcVmGv+Qo="
+    sum = "kFmlrYJbJUFFTEXjC9cquc80WB+UpZ/6oMPKrfgyeks="
     url = "https://github.com/KusionStack/catalog.git"
     commit = "a29e3db"
diff --git a/pkg/client/test_data/add_with_git_commit/test_pkg_win/kcl.mod.bak b/pkg/client/test_data/add_with_git_commit/test_pkg_win/kcl.mod.bak
@@ -0,0 +1,6 @@
+[package]
+name = "with_sum_check"
+edition = "0.0.1"
+version = "0.0.1"
+
+[dependencies]
diff --git a/pkg/client/test_data/add_with_git_commit/test_pkg_win/kcl.mod.expect b/pkg/client/test_data/add_with_git_commit/test_pkg_win/kcl.mod.expect
@@ -0,0 +1,7 @@
+[package]
+name = "with_sum_check"
+edition = "0.0.1"
+version = "0.0.1"
+
+[dependencies]
+catalog = { git = "https://github.com/KusionStack/catalog.git", commit = "a29e3db" }
diff --git a/pkg/client/test_data/add_with_git_commit/test_pkg_win/kcl.mod.lock.bak b/pkg/client/test_data/add_with_git_commit/test_pkg_win/kcl.mod.lock.bak
diff --git a/pkg/client/test_data/add_with_git_commit/test_pkg_win/kcl.mod.lock.expect b/pkg/client/test_data/add_with_git_commit/test_pkg_win/kcl.mod.lock.expect
@@ -0,0 +1,8 @@
+[dependencies]
+  [dependencies.catalog]
+    name = "catalog"
+    full_name = "catalog_a29e3db"
+    version = "a29e3db"
+    sum = "zhh1yHk5TrNi9apHUQF3hPOlwi5Kc75cNHjcVmGv+Qo="
+    url = "https://github.com/KusionStack/catalog.git"
+    commit = "a29e3db"
diff --git a/pkg/client/test_data/add_with_git_commit/test_pkg_win/main.k b/pkg/client/test_data/add_with_git_commit/test_pkg_win/main.k
@@ -0,0 +1 @@
+The_first_kcl_program = 'Hello World!'
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 = "zhh1yHk5TrNi9apHUQF3hPOlwi5Kc75cNHjcVmGv+Qo="
+    sum = "kFmlrYJbJUFFTEXjC9cquc80WB+UpZ/6oMPKrfgyeks="
     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 = "zhh1yHk5TrNi9apHUQF3hPOlwi5Kc75cNHjcVmGv+Qo="
+    sum = "kFmlrYJbJUFFTEXjC9cquc80WB+UpZ/6oMPKrfgyeks="
     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 = "zhh1yHk5TrNi9apHUQF3hPOlwi5Kc75cNHjcVmGv+Qo="
+    sum = "kFmlrYJbJUFFTEXjC9cquc80WB+UpZ/6oMPKrfgyeks="
     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 = "zhh1yHk5TrNi9apHUQF3hPOlwi5Kc75cNHjcVmGv+Qo="
+    sum = "kFmlrYJbJUFFTEXjC9cquc80WB+UpZ/6oMPKrfgyeks="
     url = "https://github.com/KusionStack/catalog.git"
     commit = "a29e3db"