opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6722 from vrothberg/fix-6718

Browse Source 
image load: no args required
This commit is contained in:
OpenShift Merge Robot
2020-06-23 16:47:42 +02:00
committed by GitHub
parent bbaba9fb86 138d447eb4
commit 73514b1465
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/images/load.go
View File

@ -30,7 +30,7 @@ var (
} }
imageLoadCommand = &cobra.Command{ imageLoadCommand = &cobra.Command{
Args: cobra.MinimumNArgs(1), Args: loadCommand.Args,
Use: loadCommand.Use, Use: loadCommand.Use,
Short: loadCommand.Short, Short: loadCommand.Short,
Long: loadCommand.Long, Long: loadCommand.Long,

18
test/system/120-load.bats
View File

@ -44,6 +44,11 @@ verify_iid_and_name() {
run_podman load < $archive run_podman load < $archive
verify_iid_and_name "<none>:<none>" 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; # Cleanup: since load-by-iid doesn't preserve name, re-tag it;
# otherwise our global teardown will rmi and re-pull our standard image. # otherwise our global teardown will rmi and re-pull our standard image.
run_podman tag $iid $img_name run_podman tag $iid $img_name
@ -57,9 +62,14 @@ verify_iid_and_name() {
# Load using -i; this time the image should be tagged. # Load using -i; this time the image should be tagged.
run_podman load -i $archive run_podman load -i $archive
verify_iid_and_name $img_name verify_iid_and_name $img_name
run_podman rmi $iid
# Also make sure that `image load` behaves the same.
run_podman image load -i $archive
verify_iid_and_name $img_name
run_podman rmi $iid
# Same as above, using stdin # Same as above, using stdin
run_podman rmi $iid
run_podman load < $archive run_podman load < $archive
verify_iid_and_name $img_name verify_iid_and_name $img_name
} }
@ -97,4 +107,10 @@ verify_iid_and_name() {
"Diagnostic from 'podman load' without redirection or -i" "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 # vim: filetype=sh