Skip to content

Commit aee9d3c

Browse files
committed
parallelize 010
Signed-off-by: Ed Santiago <[email protected]>
1 parent 9683068 commit aee9d3c

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

test/system/010-images.bats

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ Deleted: $pauseID"
305305
run_podman image exists $IMAGE
306306
}
307307

308+
# bats test_tags=ci:parallel
308309
@test "podman rmi --ignore" {
309310
random_image_name=i_$(safename)
310311
run_podman 1 rmi $random_image_name
@@ -313,6 +314,7 @@ Deleted: $pauseID"
313314
is "$output" ""
314315
}
315316

317+
# bats test_tags=ci:parallel
316318
@test "podman image rm --force bogus" {
317319
run_podman 1 image rm bogus
318320
is "$output" "Error: bogus: image not known" "Should print error"
@@ -328,6 +330,7 @@ Deleted: $pauseID"
328330
assert "$output" !~ "$random_image_name" "image must be removed"
329331
}
330332

333+
# bats test_tags=ci:parallel
331334
@test "podman images - commit docker with comment" {
332335
cname=c_$(safename)
333336
iname=i_$(safename)
@@ -400,6 +403,7 @@ EOF
400403
run_podman --root $imstore/root rmi --all
401404
}
402405

406+
# bats test_tags=ci:parallel
403407
@test "podman images with concurrent removal" {
404408
skip_if_remote "following test is not supported for remote clients"
405409
local count=5
@@ -410,19 +414,19 @@ EOF
410414
FROM $IMAGE
411415
RUN echo $i
412416
EOF
413-
run_podman build -q -t i$i $PODMAN_TMPDIR
417+
run_podman build -q -t img-$i-$(safename) $PODMAN_TMPDIR
414418
done
415419

416420
run_podman images
417421
# Now remove all images in parallel and in the background and make sure
418422
# that listing all images does not fail (see BZ 2216700).
419423
for i in $(seq --format '%02g' 1 $count); do
420424
timeout --foreground -v --kill=10 60 \
421-
$PODMAN rmi i$i &
425+
$PODMAN rmi img-$i-$(safename) &
422426
done
423427

424428
tries=100
425-
while [[ ${#lines[*]} -gt 1 ]] && [[ $tries -gt 0 ]]; do
429+
while [[ "$output" =~ "$(safename)" ]] && [[ $tries -gt 0 ]]; do
426430
# Prior to #18980, 'podman images' during rmi could fail with 'image not known'
427431
# '0+w' because we sometimes get warnings.
428432
run_podman 0+w images --format "{{.ID}} {{.Names}}"

0 commit comments

Comments
 (0)