mirror of https://github.com/containers/podman.git
BATS tests - get working again
Various small fixes to get BATS tests working again.
Split from #2947 because that one keeps getting stalled,
and I'm hoping these separate changes get approved.
I consider these changes urgent because RHEL8 gating
tests are failing, and will fail even more if/when #2272
gets picked up and packaged for RHEL8, and I consider
it important to have clean passing tests for RHEL8.
* info test: 'insecure registries' is gone. A recent
commit (d1a7378aa
) changed the format of 'podman info',
removing the 'insecure registries' key. Deal with it.
* info test: remove check for .host.{Conmon,OCIRuntime}.package;
the value on f28 and f29 is 'Unknown' (instead of an NVR).
We can live without this check.
* 'load' test: skip when running in CI, because stdin
is not a tty.
* container restore: fix arg processing. #2272 broke argument
processing: 'podman container restore', with no args, should
exit with 'argument required' error. Root cause is that the
new --import option takes the place of an argument, so the
checkAllAndLatest() call had to be changed to not exit on error.
Workaround is (sigh) to copy/paste the skipped checkAllAndLatest()
code, with minor tweaks to accommodate --import.
Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
parent
c93b8d6b02
commit
bd0582dd34
|
@ -79,5 +79,14 @@ func restoreCmd(c *cliconfig.RestoreValues, cmd *cobra.Command) error {
|
||||||
if (c.Import != "") && (c.All || c.Latest) {
|
if (c.Import != "") && (c.All || c.Latest) {
|
||||||
return errors.Errorf("Cannot use --import and --all or --latest at the same time")
|
return errors.Errorf("Cannot use --import and --all or --latest at the same time")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
argLen := len(c.InputArgs)
|
||||||
|
if (c.All || c.Latest) && argLen > 0 {
|
||||||
|
return errors.Errorf("no arguments are needed with --all or --latest")
|
||||||
|
}
|
||||||
|
if argLen < 1 && !c.All && !c.Latest && c.Import == "" {
|
||||||
|
return errors.Errorf("you must provide at least one name or id")
|
||||||
|
}
|
||||||
|
|
||||||
return runtime.Restore(getContext(), c, options)
|
return runtime.Restore(getContext(), c, options)
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ Distribution:
|
||||||
OCIRuntime:\\\s\\\+package:
|
OCIRuntime:\\\s\\\+package:
|
||||||
os:
|
os:
|
||||||
rootless:
|
rootless:
|
||||||
insecure registries:
|
registries:
|
||||||
store:
|
store:
|
||||||
GraphDriverName:
|
GraphDriverName:
|
||||||
GraphRoot:
|
GraphRoot:
|
||||||
|
@ -37,9 +37,7 @@ RunRoot:
|
||||||
|
|
||||||
tests="
|
tests="
|
||||||
host.BuildahVersion | [0-9.]
|
host.BuildahVersion | [0-9.]
|
||||||
host.Conmon.package | $expr_nvr
|
|
||||||
host.Conmon.path | $expr_path
|
host.Conmon.path | $expr_path
|
||||||
host.OCIRuntime.package | $expr_nvr
|
|
||||||
host.OCIRuntime.path | $expr_path
|
host.OCIRuntime.path | $expr_path
|
||||||
store.ConfigFile | $expr_path
|
store.ConfigFile | $expr_path
|
||||||
store.GraphDriverName | [a-z0-9]\\\+\\\$
|
store.GraphDriverName | [a-z0-9]\\\+\\\$
|
||||||
|
|
|
@ -87,6 +87,10 @@ verify_iid_and_name() {
|
||||||
|
|
||||||
|
|
||||||
@test "podman load - will not read from tty" {
|
@test "podman load - will not read from tty" {
|
||||||
|
if [ ! -t 0 ]; then
|
||||||
|
skip "STDIN is not a tty"
|
||||||
|
fi
|
||||||
|
|
||||||
run_podman 125 load
|
run_podman 125 load
|
||||||
is "$output" \
|
is "$output" \
|
||||||
"Error: cannot read from terminal. Use command-line redirection" \
|
"Error: cannot read from terminal. Use command-line redirection" \
|
||||||
|
|
Loading…
Reference in New Issue