Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

image load: no args required #6722

Merged
merged 1 commit into from
Jun 23, 2020
Merged

image load: no args required #6722

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion cmd/podman/images/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var (
}

imageLoadCommand = &cobra.Command{
Args: cobra.MinimumNArgs(1),
Args: loadCommand.Args,
Use: loadCommand.Use,
Short: loadCommand.Short,
Long: loadCommand.Long,
Expand Down
18 changes: 17 additions & 1 deletion test/system/120-load.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ verify_iid_and_name() {
run_podman load < $archive
verify_iid_and_name "<none>:<none>"

# Same as above, using stdin but with `podman image load`
run_podman rmi $iid
run_podman image load < $archive
verify_iid_and_name "<none>:<none>"

# Cleanup: since load-by-iid doesn't preserve name, re-tag it;
# otherwise our global teardown will rmi and re-pull our standard image.
run_podman tag $iid $img_name
Expand All @@ -57,9 +62,14 @@ verify_iid_and_name() {
# Load using -i; this time the image should be tagged.
run_podman load -i $archive
verify_iid_and_name $img_name
run_podman rmi $iid

# Same as above, using stdin
# Also make sure that `image load` behaves the same.
run_podman image load -i $archive
vrothberg marked this conversation as resolved.
Show resolved Hide resolved
verify_iid_and_name $img_name
run_podman rmi $iid

# Same as above, using stdin
run_podman load < $archive
verify_iid_and_name $img_name
}
Expand Down Expand Up @@ -97,4 +107,10 @@ verify_iid_and_name() {
"Diagnostic from 'podman load' without redirection or -i"
}

@test "podman load - at most 1 arg(s)" {
run_podman 125 load 1 2 3
is "$output" \
"Error: accepts at most 1 arg(s), received 3"
}

# vim: filetype=sh