fix: replace test case helloworld by flask_manifests

Signed-off-by: zongz <zongzhe1024@163.com>
kcl-lang · Nov 13, 2024 · 81a38e4 · 81a38e4
1 parent 9622092
commit 81a38e4
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 15 deletions.
diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go
@@ -99,7 +99,6 @@ func TestWithGlobalLock(t *testing.T) {
 	test.RunTestWithGlobalLock(t, "testPullWithOnlySpec", testPullWithOnlySpec)
 	test.RunTestWithGlobalLock(t, "TestRunWithModSpecVersion", testRunWithModSpecVersion)
 	test.RunTestWithGlobalLock(t, "TestGraph", testGraph)
-	test.RunTestWithGlobalLock(t, "testRunWithHyphenEntries", testRunWithHyphenEntries)
 	test.RunTestWithGlobalLock(t, "testUpdate", testUpdate)
 	test.RunTestWithGlobalLock(t, "testRunWithNoSumCheck", testRunWithNoSumCheck)
 	test.RunTestWithGlobalLock(t, "testCyclicDependency", testCyclicDependency)
@@ -113,6 +112,7 @@ func TestWithGlobalLock(t *testing.T) {
 	test.RunTestWithGlobalLock(t, "TestAddDepsWithInsecureSkipTLSverify", testAddDepsWithInsecureSkipTLSverify)
 	test.RunTestWithGlobalLock(t, "testPushWithInsecureSkipTLSverify", testPushWithInsecureSkipTLSverify)
 	test.RunTestWithGlobalLock(t, "testMetadataOffline", testMetadataOffline)
+	test.RunTestWithGlobalLock(t, "testRunWithHyphenEntries", testRunWithHyphenEntries)
 
 	features.Enable(features.SupportNewStorage)
 	test.RunTestWithGlobalLock(t, "testAddWithModSpec", testAddWithModSpec)

diff --git a/pkg/client/run_test.go b/pkg/client/run_test.go
@@ -106,10 +106,10 @@ func testRunWithHyphenEntries(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	expect := `The_first_kcl_program_current_mod: Hello Current Mod World!
-The_fisrt_schema_inst:
-  msg: Hello Schema!
-The_first_kcl_program: Hello World!`
+	expect, err := os.ReadFile(filepath.Join(pkgPath, "stdout"))
+	if err != nil {
+		t.Fatal(err)
+	}
 
-	assert.Equal(t, utils.RmNewline(res.GetRawYamlResult()), utils.RmNewline(expect))
+	assert.Equal(t, utils.RmNewline(res.GetRawYamlResult()), utils.RmNewline(string(expect)))
 }
diff --git a/pkg/client/test_data/test_run_hyphen_entries/kcl.mod b/pkg/client/test_data/test_run_hyphen_entries/kcl.mod
@@ -4,7 +4,7 @@ edition = "v0.10.0"
 version = "0.0.1"
 
 [dependencies]
-hello-world = { package = "helloworld", version = "0.1.4" }
+flask_manifests = { git = "https://github.com/kcl-lang/flask-demo-kcl-manifests.git", commit = "ade147b", version = "0.0.1" }
 
 [profile]
-entries = ["main.k", "${hello-world:KCL_MOD}/main.k"]
+entries = ["main.k", "${flask-manifests:KCL_MOD}/main.k"]
diff --git a/pkg/client/test_data/test_run_hyphen_entries/kcl.mod.lock b/pkg/client/test_data/test_run_hyphen_entries/kcl.mod.lock
@@ -1,8 +1,7 @@
 [dependencies]
-  [dependencies.hello-world]
-    name = "hello-world"
-    full_name = "helloworld_0.1.4"
-    version = "0.1.4"
-    reg = "ghcr.io"
-    repo = "kcl-lang/helloworld"
-    oci_tag = "0.1.4"
+  [dependencies.flask_manifests]
+    name = "flask_manifests"
+    full_name = "flask_manifests_0.0.1"
+    version = "0.0.1"
+    url = "https://github.com/kcl-lang/flask-demo-kcl-manifests.git"
+    commit = "ade147b"
diff --git a/pkg/client/test_data/test_run_hyphen_entries/stdout b/pkg/client/test_data/test_run_hyphen_entries/stdout
@@ -0,0 +1,18 @@
+The_first_kcl_program_current_mod: Hello Current Mod World!
+config:
+  name: flask-demo
+  replicas: 1
+  labels:
+    app: flask-demo
+  service:
+    type: NodePort
+    ports:
+    - port: 5000
+      protocol: TCP
+      targetPort: 5000
+  containers:
+    flaskdemo:
+      image: kcllang/flask_demo:8d31498e765ff67a2fa9933d4adffe067544b2fe
+      ports:
+      - protocol: TCP
+        containerPort: 5000