opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-28 14:29:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5767 from edsantiago/logformat_add_anchors_and_apiv2

Browse Source 
logformat: handle apiv2 results, add anchor links
This commit is contained in:
OpenShift Merge Robot
2020-04-15 10:50:15 -07:00
committed by GitHub
parent 9b78bf9293 55eea9127a
commit ef297d466e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/cirrus/logformatter
View File

@ -220,8 +220,8 @@ END_HTML
$cirrus_task = $1; $cirrus_task = $1;
} }
# BATS handling # BATS handling (used also for apiv2 tests, which emit TAP output)
if ($line =~ /^1\.\.\d+$/) { if ($line =~ /^1\.\.\d+$/ || $line =~ m!/test-apiv2!) {
$looks_like_bats = 1; $looks_like_bats = 1;
} }
if ($looks_like_bats) { if ($looks_like_bats) {
@ -234,6 +234,10 @@ END_HTML
elsif ($line =~ /^#\s/) { $css = 'log' } elsif ($line =~ /^#\s/) { $css = 'log' }
if ($css) { if ($css) {
# Make it linkable, e.g. foo.html#t--00001
if ($line =~ /^(not\s+)?ok\s+(\d+)/) {
$line = sprintf("<a name='t--%05d'>%s</a>", $2, $line);
}
$line = "<span class='bats-$css'>$line</span>"; $line = "<span class='bats-$css'>$line</span>";
} }

2
test/apiv2/test-apiv2
View File

@ -355,7 +355,7 @@ done
if [ -n "$service_pid" ]; then if [ -n "$service_pid" ]; then
kill $service_pid kill $service_pid
wait -f $service_pid wait $service_pid
fi fi
test_count=$(<$testcounter_file) test_count=$(<$testcounter_file)