summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/podman/images/load.go2
-rw-r--r--test/system/120-load.bats18
2 files changed, 18 insertions, 2 deletions
diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go
index a984ad81f..115e9a070 100644
--- a/cmd/podman/images/load.go
+++ b/cmd/podman/images/load.go
@@ -30,7 +30,7 @@ var (
}
imageLoadCommand = &cobra.Command{
- Args: cobra.MinimumNArgs(1),
+ Args: loadCommand.Args,
Use: loadCommand.Use,
Short: loadCommand.Short,
Long: loadCommand.Long,
diff --git a/test/system/120-load.bats b/test/system/120-load.bats
index 15df6adec..f290c1888 100644
--- a/test/system/120-load.bats
+++ b/test/system/120-load.bats
@@ -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
@@ -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
+ 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
}
@@ -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