Skip to content

Commit 0a41bed

Browse files
committed
tests(actions): fix failure rerun
add non empty file check for rerun append failed tests from different runs
1 parent 064f3f6 commit 0a41bed

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

.ci/run_tests.sh

+12-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function red() {
1010
}
1111

1212
function get_failed {
13-
if [ ! -z "$FAILED_TEST_FILES_FILE" -a -f "$FAILED_TEST_FILES_FILE" ]
13+
if [ ! -z "$FAILED_TEST_FILES_FILE" -a -s "$FAILED_TEST_FILES_FILE" ]
1414
then
1515
cat < $FAILED_TEST_FILES_FILE
1616
else
@@ -103,8 +103,19 @@ if [ "$TEST_SUITE" == "plugins" ]; then
103103
echo
104104

105105
$TEST_CMD $p || echo "* $p" >> .failed
106+
107+
# the suite is run multiple times for plugins: collect partial failures
108+
if [ ! -z "$FAILED_TEST_FILES_FILE" ]
109+
then
110+
cat "$FAILED_TEST_FILES_FILE" >> "$FAILED_TEST_FILES_FILE.tmp"
111+
fi
106112
done
107113

114+
if [ ! -z "$FAILED_TEST_FILES_FILE.tmp" -a -s "$FAILED_TEST_FILES_FILE.tmp" ]
115+
then
116+
mv "$FAILED_TEST_FILES_FILE.tmp" "$FAILED_TEST_FILES_FILE"
117+
fi
118+
108119
if [[ "$TEST_SPLIT" != first* ]]; then
109120
cat kong-*.rockspec | grep kong- | grep -v zipkin | grep -v sidecar | grep "~" | grep -v kong-prometheus-plugin | while read line ; do
110121
REPOSITORY=`echo $line | sed "s/\"/ /g" | awk -F" " '{print $1}'`

0 commit comments

Comments
 (0)