Refactor testListBlpopNoTimeout to use different clients and update response assertion method. Introduce AssertResponsesInReverseOrder for handling response assertions in reverse. Update logging for no response expectations in various test fixtures.

Author: andy1li

internal/test_cases/blocking_client_group_test_case.go

@@ -56,20 +56,37 @@ func (t *BlockingClientGroupTestCase) SendBlockingCommands() error {
 
 func (t *BlockingClientGroupTestCase) AssertResponses(logger *logger.Logger) error {
 	for _, clientWithExpectedResponse := range t.clientsWithExpectedResponses {
-		clientLogger := clientWithExpectedResponse.Client.GetLogger()
-		if clientWithExpectedResponse.Assertion == nil {
-			testCase := NoResponseTestCase{}
-			if err := testCase.Run(clientWithExpectedResponse.Client); err != nil {
-				return err
-			}
-		} else {
-			clientLogger.Infof("Expecting response of %s command", clientWithExpectedResponse.Command)
-			testCase := ReceiveValueTestCase{
-				Assertion: *clientWithExpectedResponse.Assertion,
-			}
-			if err := testCase.Run(clientWithExpectedResponse.Client, logger); err != nil {
-				return err
-			}
+		if err := t.assertResponse(&clientWithExpectedResponse, logger); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (t *BlockingClientGroupTestCase) AssertResponsesInReverseOrder(logger *logger.Logger) error {
+	for i := len(t.clientsWithExpectedResponses) - 1; i >= 0; i-- {
+		clientWithExpectedResponse := t.clientsWithExpectedResponses[i]
+		if err := t.assertResponse(&clientWithExpectedResponse, logger); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (t *BlockingClientGroupTestCase) assertResponse(clientWithExpectedResponse *clientWithExpectedResponse, logger *logger.Logger) error {
+	clientLogger := clientWithExpectedResponse.Client.GetLogger()
+	if clientWithExpectedResponse.Assertion == nil {
+		testCase := NoResponseTestCase{}
+		if err := testCase.Run(clientWithExpectedResponse.Client); err != nil {
+			return err
+		}
+	} else {
+		clientLogger.Infof("Expecting response of %s command", clientWithExpectedResponse.Command)
+		testCase := ReceiveValueTestCase{
+			Assertion: *clientWithExpectedResponse.Assertion,
+		}
+		if err := testCase.Run(clientWithExpectedResponse.Client, logger); err != nil {
+			return err
 		}
 	}
 	return nil

internal/test_helpers/fixtures/geospatial/pass

@@ -4,22 +4,20 @@ 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 63777 -> port 6379)
-[tester::#EC3] [client-2] Connected (port 63778 -> port 6379)
-[tester::#EC3] [client-3] Connected (port 63779 -> port 6379)
+[tester::#EC3] [client-1] Connected (port 59889 -> port 6379)
+[tester::#EC3] [client-2] Connected (port 59890 -> port 6379)
+[tester::#EC3] [client-3] Connected (port 59891 -> port 6379)
+[tester::#EC3] [client-1] $ redis-cli BLPOP pear 0
+[tester::#EC3] [client-1] Sent bytes: "*3\r\n$5\r\nBLPOP\r\n$4\r\npear\r\n$1\r\n0\r\n"
 [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
-[tester::#EC3] [client-3] Sent bytes: "*3\r\n$5\r\nBLPOP\r\n$4\r\npear\r\n$1\r\n0\r\n"
-[tester::#EC3] [client-1] $ redis-cli RPUSH pear orange
-[tester::#EC3] [client-1] Sent bytes: "*3\r\n$5\r\nRPUSH\r\n$4\r\npear\r\n$6\r\norange\r\n"
-[tester::#EC3] [client-1] Received bytes: ":1\r\n"
-[tester::#EC3] [client-1] Received RESP integer: 1
-[tester::#EC3] [client-1] ✔︎ Received 1
-[tester::#EC3] [client-2] Expecting response of BLPOP command
-[tester::#EC3] Received: "" (no content received)
-[tester::#EC3]            ^ error
-[tester::#EC3] Error: Expected start of a new RESP2 value (either +, -, :, $ or *)
+[tester::#EC3] [client-3] $ redis-cli RPUSH pear orange
+[tester::#EC3] [client-3] Sent bytes: "*3\r\n$5\r\nRPUSH\r\n$4\r\npear\r\n$6\r\norange\r\n"
+[tester::#EC3] [client-3] Received bytes: ":1\r\n"
+[tester::#EC3] [client-3] Received RESP integer: 1
+[tester::#EC3] [client-3] ✔︎ Received 1
+[tester::#EC3] [client-2] Expecting no response
+[tester::#EC3] client-2 received unexpected response: "*2\r\n$4\r\npear\r\n$6\r\norange\r\n"
 [tester::#EC3] Test failed
 [tester::#EC3] Terminating program
 [tester::#EC3] Program terminated successfully