fix test kangle.reload missing resp.body close

keengo99 · Dec 10, 2024 · 596e1a1 · 596e1a1
1 parent 68e7b49
commit 596e1a1
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 17 deletions.
diff --git a/khttpd b/khttpd
diff --git a/test/test_framework/base_suite/config.go b/test/test_framework/base_suite/config.go
@@ -10,15 +10,17 @@ import (
 
 func check_reload_none_config() {
 	kangle.CleanExtConfig("not_exsit")
-	kangle.Reload("ext|not_exsit.xml_")
+	resp := kangle.Reload("ext|not_exsit.xml_")
 	common.AssertPort(4444, false)
 	kangle.CreateExtConfig("not_exsit", `<!--#start 10 -->
 <config>
 	<listen ip='127.0.0.1' port='4444' type='http'/>
 </config>
 `)
-	kangle.Reload("ext|not_exsit.xml_")
+	resp.Body.Close()
+	resp = kangle.Reload("ext|not_exsit.xml_")
 	common.AssertPort(4444, true)
+	resp.Body.Close()
 
 }
 func check_listen_config() {
@@ -34,9 +36,11 @@ func check_listen_config() {
 	<config>		
 	</config>	
 	`)
+	resp.Body.Close()
 	resp = kangle.Reload("ext|10.xml_")
 	common.AssertSame(resp.StatusCode, 204)
 	common.AssertPort(7777, false)
+	resp.Body.Close()
 }
 func check_vh_config() {
 	access_file := config.Cfg.BasePath + "/www/access.xml"
@@ -50,7 +54,7 @@ func check_vh_config() {
 </config>
 <!--configfileisok-->
 `)
-	kangle.Reload("ext|20.xml_")
+	resp := kangle.Reload("ext|20.xml_")
 
 	kangle.CreateExtConfig("20", `<!--#start 20 -->
 	<config>
@@ -60,7 +64,8 @@ func check_vh_config() {
 		</vh>
 	</config>
 	`)
-	kangle.Reload("ext|20.xml_")
+	resp.Body.Close()
+	resp = kangle.Reload("ext|20.xml_")
 
 	kangle.CreateExtConfig("20", `<!--#start 20 -->
 		<config>
@@ -69,8 +74,9 @@ func check_vh_config() {
 			</vh>
 		</config>
 		`)
-	kangle.Reload("ext|20.xml_")
-
+	resp.Body.Close()
+	resp = kangle.Reload("ext|20.xml_")
+	resp.Body.Close()
 	kangle.ReloadConfig()
 }
 func create_wrong_ssl_cert() {
@@ -112,9 +118,11 @@ func check_listen_ssl_config_change() {
 <config>
 	<listen ip='127.0.0.1' port='7766' type='https' certificate='etc/server2.crt' certificate_key='etc/server.key' http2='1' />
 </config>`)
-	kangle.Reload("ext|20.xml_")
+	resp := kangle.Reload("ext|20.xml_")
+	resp.Body.Close()
 	create_right_ssl_cert()
-	kangle.Reload("ext|20.xml_")
+	resp = kangle.Reload("ext|20.xml_")
+	resp.Body.Close()
 	check_ssl_port_status("", 7766)
 }
 func check_ssl_port_status(host string, port int) {
@@ -139,13 +147,15 @@ func check_vh_ssl_config_change() {
 </config>
 <!--configfileisok-->
 `)
-	kangle.Reload("ext|20.xml_")
+	resp := kangle.Reload("ext|20.xml_")
+	resp.Body.Close()
 	create_right_ssl_cert()
-	kangle.Reload("ext|20.xml_")
+	resp = kangle.Reload("ext|20.xml_")
+	resp.Body.Close()
 	check_ssl_port_status("", 7767)
 	kangle.CreateExtConfig("20", `<!--#start 20 --><!--configfileisok-->`)
-	kangle.Reload("ext|20.xml_")
-
+	resp = kangle.Reload("ext|20.xml_")
+	resp.Body.Close()
 }
 func check_vh_host_ssl_change() {
 	create_wrong_ssl_cert()
@@ -159,12 +169,15 @@ func check_vh_host_ssl_change() {
 </config>
 <!--configfileisok-->
 `)
-	kangle.Reload("ext|20.xml_")
+	resp := kangle.Reload("ext|20.xml_")
 	create_right_ssl_cert()
-	kangle.Reload("ext|20.xml_")
+	resp.Body.Close()
+	resp = kangle.Reload("ext|20.xml_")
+	resp.Body.Close()
 	check_ssl_port_status(config.GetLocalhost("testssl"), 7768)
 	kangle.CreateExtConfig("20", `<!--#start 20 --><!--configfileisok-->`)
-	kangle.Reload("ext|20.xml_")
+	resp = kangle.Reload("ext|20.xml_")
+	resp.Body.Close()
 }
 func check_config() {
 

diff --git a/test/test_framework/base_suite/config_server.go b/test/test_framework/base_suite/config_server.go
@@ -36,7 +36,8 @@ func create_config_file(server_cfg string) {
 </config>
 <!--configfileisok-->
 	`, server_cfg))
-	kangle.Reload("ext|20.xml_")
+	resp := kangle.Reload("ext|20.xml_")
+	resp.Body.Close()
 }
 func check_config_server() {
 

diff --git a/test/test_framework/kangle/main.go b/test/test_framework/kangle/main.go
@@ -26,14 +26,17 @@ func CleanAllCache() {
 		panic(err)
 	}
 	common.Assert("clean_all_cache", resp.StatusCode == 200)
+	resp.Body.Close()
 }
 func ReloadConfig() {
 	resp, _ := common.Http1Client.Get("http://127.0.0.1:9911/reload_config")
 	common.Assert("reload_config", resp.StatusCode == 200)
+	resp.Body.Close()
 }
 func FlushDiskCache() {
 	resp, _ := common.Http1Client.Get("http://127.0.0.1:9911/flush_disk_cache.km")
 	common.Assert("reload_config", resp.StatusCode == 200)
+	resp.Body.Close()
 }
 func CreateFile(filename string, content string) error {
 	config_file, err := os.Create(filename)

diff --git a/test/test_framework/suite/process.go b/test/test_framework/suite/process.go
@@ -30,6 +30,7 @@ func SplitSuiteCase(name string) (suite string, testCase string) {
 	return name, ""
 }
 func Init(names []string) {
+	inited_suite := make(map[string]bool, 0)
 	for _, name := range names {
 		s, _ := SplitSuiteCase(name)
 		suite, ok := suites[s]
@@ -38,6 +39,11 @@ func Init(names []string) {
 			panic("")
 		}
 		common.AssertSame(ok, true)
+		_, ok = inited_suite[s]
+		if ok {
+			continue
+		}
+		inited_suite[s] = true
 		fmt.Printf("init suite [%s]\n", name)
 		suite.Init()
 	}