Skip to content

Commit 4aff3f9

Browse files
Make RedisArray tests exit with a nonzero exit code on failure
1 parent 83ac4ba commit 4aff3f9

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

tests/RedisArrayTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ function run_tests($className, $str_filter, $str_host) {
548548
$serverList = Array("$str_host:6379", "$str_host:6380", "$str_host:6381", "$str_host:6382");
549549

550550
// run
551-
TestSuite::run($className, $str_filter);
551+
return TestSuite::run($className, $str_filter);
552552
}
553553

554554
?>

tests/TestRedis.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,14 @@
4747
foreach(array(true, false) as $useIndex) {
4848
echo "\n".($useIndex?"WITH":"WITHOUT"). " per-node index:\n";
4949

50-
run_tests('Redis_Array_Test', $str_filter, $str_host);
51-
run_tests('Redis_Rehashing_Test', $str_filter, $str_host);
52-
run_tests('Redis_Auto_Rehashing_Test', $str_filter, $str_host);
53-
run_tests('Redis_Multi_Exec_Test', $str_filter, $str_host);
54-
run_tests('Redis_Distributor_Test', $str_filter, $str_host);
50+
/* The various RedisArray subtests we can run */
51+
$arr_ra_tests = ['Redis_Array_Test', 'Redis_Rehashing_Test', 'Redis_Auto_Rehashing_Test', 'Redis_Multi_Exec_Test', 'Redis_Distributor_Test'];
52+
foreach ($arr_ra_tests as $str_test) {
53+
/* Run until we encounter a failure */
54+
if (run_tests($str_test, $str_filter, $str_host) != 0) {
55+
exit(1);
56+
}
57+
}
5558
}
5659
} else {
5760
echo TestSuite::make_bold("RedisCluster") . "\n";

0 commit comments

Comments
 (0)