Merge pull request #9256 from AttilaVamos/HPCC-16492-fix-6.2.0

HPCC-16492 Rediserrortest.ecl doesn't handle subscribe timeout

Reviewed-By: Dan Camper <dan.camper@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

testing/regress/ecl/rediserrortests.ecl

@@ -115,6 +115,7 @@ STRING pluginTO := 'Redis Plugin: ERROR - function timed out internally.';
 STRING redisTO := 'Redis Plugin: ERROR - GetOrLock<type> \'timeoutTest2\' on database 0 for 127.0.0.1:6379 failed : Resource temporarily unavailable';
 STRING authTO := 'Redis Plugin: ERROR - server authentication for 127.0.0.1:6379 failed : Resource temporarily unavailable';
 STRING getSetTO := 'Redis Plugin: ERROR - SET %b %b NX PX 1000 \'timeoutTest2\' on database 0 for 127.0.0.1:6379 failed : Resource temporarily unavailable';
+STRING subscribeTO := 'Redis Plugin: ERROR - SUBSCRIBE &apos;redis_ecl_lock_timeoutTest2_0&apos; on database 0 for 127.0.0.1:6379 failed : Resource temporarily unavailable';
 dsTO2 := DATASET(NOFOLD(1), TRANSFORM({string value}, SELF.value := redis.GetOrLockString('timeoutTest' + (string)(1+COUNTER), server, /*database*/, password, 1/*ms*/)));
 SEQUENTIAL(
     myRedis.FlushDB();
@@ -122,7 +123,8 @@ SEQUENTIAL(
     OUTPUT(CATCH(dsTO2, ONFAIL(TRANSFORM({ STRING value }, SELF.value := IF(FAILMESSAGE = pluginTO
                                                                          OR FAILMESSAGE = redisTO
                                                                          OR FAILMESSAGE = authTO
-                                                                         OR FAILMESSAGE = getSetTO,
+                                                                         OR FAILMESSAGE = getSetTO
+                                                                         OR FAILMESSAGE = subscribeTO,
                                                                          'Timed Out', 'Unexpected Error - ' + FAILMESSAGE)))));
     );