fix: fix test

Signed-off-by: zongzhe <[email protected]>
kcl-lang · Oct 14, 2024 · eb0e155 · eb0e155
1 parent 10558bf
commit eb0e155
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 64 deletions.
diff --git a/pkg/client/test_data/test_vendor/dep1/kcl.mod b/pkg/client/test_data/test_vendor/dep1/kcl.mod
diff --git a/pkg/client/test_data/test_vendor/dep1/kcl.mod.lock b/pkg/client/test_data/test_vendor/dep1/kcl.mod.lock
diff --git a/pkg/client/test_data/test_vendor/dep1/main.k b/pkg/client/test_data/test_vendor/dep1/main.k
diff --git a/pkg/client/test_data/test_vendor/dep2/kcl.mod b/pkg/client/test_data/test_vendor/dep2/kcl.mod
diff --git a/pkg/client/test_data/test_vendor/dep2/kcl.mod.lock b/pkg/client/test_data/test_vendor/dep2/kcl.mod.lock
diff --git a/pkg/client/test_data/test_vendor/dep2/main.k b/pkg/client/test_data/test_vendor/dep2/main.k
diff --git a/pkg/client/test_data/test_vendor/pkg/kcl.mod b/pkg/client/test_data/test_vendor/pkg/kcl.mod
diff --git a/pkg/client/test_data/test_vendor/pkg/kcl.mod.lock b/pkg/client/test_data/test_vendor/pkg/kcl.mod.lock
diff --git a/pkg/client/test_data/test_vendor/pkg/kcl.mod.lock.expect b/pkg/client/test_data/test_vendor/pkg/kcl.mod.lock.expect
diff --git a/pkg/client/test_data/test_vendor/pkg/main.k b/pkg/client/test_data/test_vendor/pkg/main.k
diff --git a/pkg/client/vendor.go b/pkg/client/vendor.go
@@ -30,7 +30,7 @@ func (c *KpmClient) VendorDeps(kclPkg *pkg.KclPkg) error {
 }
 
 func (c *KpmClient) vendorDeps(kclPkg *pkg.KclPkg, vendorPath string) error {
-	if ok, err := features.Enabled(features.SupportMVS); err != nil && ok {
+	if ok, err := features.Enabled(features.SupportMVS); err == nil && ok {
 		// Select all the vendored dependencies
 		// and fill the vendored dependencies into kclPkg.Dependencies.Deps
 		err := c.selectVendoredDeps(kclPkg, vendorPath, kclPkg.Dependencies.Deps)

diff --git a/pkg/client/vendor_test.go b/pkg/client/vendor_test.go
@@ -94,7 +94,7 @@ func testVendorDeps(t *testing.T) {
 func testVendorWithMVS(t *testing.T) {
 	features.Enable(features.SupportMVS)
 	defer features.Disable(features.SupportMVS)
-	testDir := getTestDir("test_vendor")
+	testDir := getTestDir("test_vendor_mvs")
 	pkgPath := filepath.Join(testDir, "pkg")
 	kPkg, err := pkg.LoadKclPkgWithOpts(
 		pkg.WithPath(pkgPath),