Merge pull request #201 from codecrafters-io/andy/fix

Add small delays between BlockingCommands + add debug logs for "[client-n] Connected (port a -> port b)"

Author: andy1li

internal/stages_test.go

@@ -151,6 +151,7 @@ func normalizeTesterOutput(testerOutput []byte) []byte {
 		"info_replication_bytes":  {regexp.MustCompile(`"\$[0-9]+\\r\\n# Replication\\r\\n[^"]+"`)},
 		"rdb_keys":                {regexp.MustCompile(`\[tester::#JW4\] .*Received .*`), regexp.MustCompile(`\[tester::#JW4\].*"(apple|orange|banana|pear|grape|pineapple|mango|strawberry|raspberry|blueberry)",?.*`)},
 		"hexdump":                 {regexp.MustCompile(`[0-9a-fA-F]{4} \| [0-9a-fA-F ]{47} \| .{0,16}`)},
+		"client_connected":        {regexp.MustCompile(`Connected \(port \d+ -> port \d+\)`)},
 	}
 
 	for replacement, regexes := range replacements {

internal/test_cases/blocking_client_group_test_case.go

@@ -1,6 +1,8 @@
 package test_cases
 
 import (
+	"time"
+
 	"github.com/codecrafters-io/redis-tester/internal/instrumented_resp_connection"
 	"github.com/codecrafters-io/redis-tester/internal/resp_assertions"
 	"github.com/codecrafters-io/tester-utils/logger"
@@ -46,6 +48,7 @@ func (t *BlockingClientGroupTestCase) SendBlockingCommands() error {
 		if err := clientWithExpectedResponse.Client.SendCommand(clientWithExpectedResponse.Command, clientWithExpectedResponse.Args...); err != nil {
 			return err
 		}
+		time.Sleep(1 * time.Millisecond) // Ensure server receives commands in order
 	}
 
 	return nil

internal/test_helpers/fixtures/lists/blpop_wrong_client

@@ -4,6 +4,9 @@ Debug = true
 [tester::#EC3] $ ./spawn_redis_server.sh
 [your_program] Logs from your program will appear here!
 [your_program] Redis server listening on 0.0.0.0:6379
+[tester::#EC3] [client-1] Connected (port 54886 -> port 6379)
+[tester::#EC3] [client-2] Connected (port 54900 -> port 6379)
+[tester::#EC3] [client-3] Connected (port 54916 -> port 6379)
 [tester::#EC3] [client-2] $ redis-cli BLPOP pear 0
 [tester::#EC3] [client-2] Sent bytes: "*3\r\n$5\r\nBLPOP\r\n$4\r\npear\r\n$1\r\n0\r\n"
 [tester::#EC3] [client-3] $ redis-cli BLPOP pear 0

internal/test_helpers/fixtures/lists/pass

@@ -2,6 +2,7 @@ package internal
 
 import (
 	"fmt"
+	"net"
 	"os"
 	"path/filepath"
 	"strings"
@@ -83,8 +84,15 @@ func SpawnClients(clientCount int, addr string, stageHarness *test_case_harness.
 			logFriendlyError(logger, err)
 			return nil, err
 		}
+
+		clientLogger := client.GetLogger()
+		clientPort := client.Conn.LocalAddr().(*net.TCPAddr).Port
+		serverPort := client.Conn.RemoteAddr().(*net.TCPAddr).Port
+		clientLogger.Debugf("Connected (port %d -> port %d)", clientPort, serverPort)
+
 		clients = append(clients, client)
 	}
+
 	return clients, nil
 }