004_timeline_switch TAP test may fail

back to CI dashboard

1 patchset tracked - current t248555_5

v5t248555_5posted Jun 17, 00:53successwon't retrystale 3mopg 19
basec37b38806 May 22, 23:10 - 92 days / 830 commits behind master (from history)
applyapplied 5 days ago
rebaselast tried 5 days ago on 033f39e69
Applying: Fix 004_timeline_switch TAP test: wait for standbys starts before primary stops
Using index info to reconstruct a base tree...
M	src/test/recovery/t/004_timeline_switch.pl
Falling back to patching base and 3-way merge...
Auto-merging src/test/recovery/t/004_timeline_switch.pl
CONFLICT (content): Merge conflict in src/test/recovery/t/004_timeline_switch.pl
Patch failed at 0001 Fix 004_timeline_switch TAP test: wait for standbys starts before primary stops

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/test/recovery/t/004_timeline_switch.pl
push5 days ago -> 5305f4a77branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1191003 / 10033m 01s / 5m 24sdocker run ... :t2485555 days ago
run 32143632106
executed 1003 - ccache 145 hit / 6474 miss - head 5305f4a77 - digest sha256:b25b9d4c00d5fd... - run 32143632106