Skip to content
This repository was archived by the owner on Oct 10, 2020. It is now read-only.

[merged] Remove --force option and use --assumeyes #602

Closed
rhatdan wants to merge 1 commit into from
Closed

[merged] Remove --force option and use --assumeyes #602

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/integration/test_system_containers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ assert_not_matches "Pulling layer" second.pull.out

ostree --repo=${ATOMIC_OSTREE_REPO} refs > refs
assert_matches busybox refs
${ATOMIC} images delete -f busybox
${ATOMIC} -y images delete -f busybox
ostree --repo=${ATOMIC_OSTREE_REPO} refs > refs
OUTPUT=$(! grep -c busybox refs)
if test $OUTPUT \!= 0; then
Expand All @@ -227,14 +227,14 @@ test $(wc -l < images.out) -lt $(wc -l < images.all.out)
assert_matches '<none>' images.all.out
assert_not_matches '<none>' images.out

${ATOMIC} images delete -f busybox
${ATOMIC} -y images delete -f busybox
${ATOMIC} images prune

# Test there are still intermediate layers left after prune
${ATOMIC} images list -f type=system --all > images.all.out
assert_matches "<none>" images.all.out

${ATOMIC} images delete -f atomic-test-system
${ATOMIC} -y images delete -f atomic-test-system
${ATOMIC} images prune

# Test there are not intermediate layers left layers now
Expand Down