Przeglądaj źródła

Merge pull request #7973 from jamienoss/issue14565-redis-add-extra-error-string-to-time-test-again

HPCC-14565 Redis plugin - catch additional results to timeout test

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 lat temu
rodzic
commit
3d736b8449
1 zmienionych plików z 6 dodań i 1 usunięć
  1. 6 1
      testing/regress/ecl/rediserrortests.ecl

+ 6 - 1
testing/regress/ecl/rediserrortests.ecl

@@ -114,11 +114,16 @@ SEQUENTIAL(
 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';
 dsTO2 := DATASET(NOFOLD(1), TRANSFORM({string value}, SELF.value := redis.GetOrLockString('timeoutTest' + (string)(1+COUNTER), server, /*database*/, password, 1/*ms*/)));
 SEQUENTIAL(
     myRedis.FlushDB();
     myRedis.GetOrLockString('timeoutTest2');
-    OUTPUT(CATCH(dsTO2, ONFAIL(TRANSFORM({ STRING value }, SELF.value := IF(FAILMESSAGE = pluginTO OR FAILMESSAGE = redisTO OR FAILMESSAGE = authTO, 'Timed Out', 'Unexpected Error - ' + FAILMESSAGE)))));
+    OUTPUT(CATCH(dsTO2, ONFAIL(TRANSFORM({ STRING value }, SELF.value := IF(FAILMESSAGE = pluginTO
+                                                                         OR FAILMESSAGE = redisTO
+                                                                         OR FAILMESSAGE = authTO
+                                                                         OR FAILMESSAGE = getSetTO,
+                                                                         'Timed Out', 'Unexpected Error - ' + FAILMESSAGE)))));
     );
 
 myRedis.FlushDB();