From 00cde72a9b95105123255b035df357d4c8159ff7 Mon Sep 17 00:00:00 2001
From: SVLAVR <skugorov.s@gmail.com>
Date: Mon, 5 Oct 2026 05:13:03 +0300
Subject: [PATCH] Test: Fix process leaks when retrying scenario tests (#6863)

https://github.com/XTLS/Xray-core/pull/6863#pullrequestreview-5362117967
---
 testing/scenarios/dokodemo_test.go | 6 ++++++
 testing/scenarios/socks_test.go    | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/testing/scenarios/dokodemo_test.go b/testing/scenarios/dokodemo_test.go
index 6b77958d7..e160ab508 100644
--- a/testing/scenarios/dokodemo_test.go
+++ b/testing/scenarios/dokodemo_test.go
@@ -115,6 +115,9 @@ func TestDokodemoTCP(t *testing.T) {
 			defer CloseServer(server)
 			break
 		}
+		if server != nil {
+			CloseServer(server)
+		}
 		retry++
 		if retry > 5 {
 			t.Fatal("All attempts failed to start client")
@@ -209,6 +212,9 @@ func TestDokodemoUDP(t *testing.T) {
 			defer CloseServer(server)
 			break
 		}
+		if server != nil {
+			CloseServer(server)
+		}
 		retry++
 		if retry > 5 {
 			t.Fatal("All attempts failed to start client")
diff --git a/testing/scenarios/socks_test.go b/testing/scenarios/socks_test.go
index 46425356a..e4682b80e 100644
--- a/testing/scenarios/socks_test.go
+++ b/testing/scenarios/socks_test.go
@@ -227,6 +227,9 @@ func TestSocksBridageUDP(t *testing.T) {
 			defer CloseServer(server)
 			break
 		}
+		if server != nil {
+			CloseServer(server)
+		}
 		retry++
 		if retry > 5 {
 			t.Fatal("All attempts failed to start server")
@@ -342,6 +345,9 @@ func TestSocksBridageUDPWithRouting(t *testing.T) {
 			defer CloseServer(server)
 			break
 		}
+		if server != nil {
+			CloseServer(server)
+		}
 		retry++
 		if retry > 5 {
 			t.Fatal("All attempts failed to start server")