diff --git a/modules b/modules index ff19983c4..afbcf1f16 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit ff19983c4ac5879e25d9230e97d658dc88fc3f06 +Subproject commit afbcf1f16a8b524a24a68561f06eba59ec0cd7f3 diff --git a/test/e2e/terraria_bot_e2e_test.go b/test/e2e/terraria_bot_e2e_test.go index 0a6fdb9ae..874360e6f 100644 --- a/test/e2e/terraria_bot_e2e_test.go +++ b/test/e2e/terraria_bot_e2e_test.go @@ -73,9 +73,14 @@ func TestGameServer_TerrariaBot_Joined(t *testing.T) { ExpectDepth: expectedDepth, RCON: map[string]any{"protocol": "none"}, ConsoleMode: "pty", + // The module's exec readiness probe: it reads /proc/net/tcp instead of + // connecting, because a tcpSocket probe's connect-and-close crashes the + // Terraria server (ObjectDisposedException in Netplay.ServerLoop). Probes: map[string]any{ "readiness": map[string]any{ - "tcpSocket": map[string]any{"port": "game"}, + "exec": map[string]any{ + "command": []any{"sh", "-c", "grep -qsE ':1E61 [0-9A-F]+:[0-9A-F]{4} 0A' /proc/net/tcp /proc/net/tcp6"}, + }, "initialDelaySeconds": int64(30), "periodSeconds": int64(10), "failureThreshold": int64(30),