BATS tests - get working again #3290
Conversation
|
@adrianreber could you PTAL at the |
|
/approve |
1 similar comment
|
/approve |
openshift-ci-robot
added
the
approved
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cevich, edsantiago, jwhonce, mheon The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
Changes LGTM, though I would like some input from @adrianreber on the |
cmd/podman/restore.go
Outdated
| 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 == "") { |
There was a problem hiding this comment.
Parenthesis are not required here.
There was a problem hiding this comment.
Confirmed, fixed, tested. I will force-push the update once I hear back re: --import. Thank you.
|
/hold |
openshift-ci-robot
added
the
do-not-merge/hold
|
No response. I'm making a judgment call and disabling use of --import with positional args. New code is a separate commit for ease of reviewing. I also rebased against latest master and verified that tests still pass. |
openshift-ci-robot
removed
the
do-not-merge/hold
Various small fixes to get BATS tests working again. Split from containers#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 containers#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 (d1a7378) 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. containers#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 <[email protected]>
I took the liberty of combining related checks together so as to avoid a little duplication; if this is not a Go best practice, I will revert. I also made a minor wording adjustment to an error message for clarity. Also: update wording of man page. Signed-off-by: Ed Santiago <[email protected]>
|
New changes LGTM |
|
/lgtm |
|
Sorry, just saw this right now. I was away from a keyboard for a bit more than a week. I see that this is merged, so actually no further comment necessary. It looks correct that |
github-actions
bot
added
the
locked - please file new issue/PR
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 (d1a7378) 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. Add support to migrate containers #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.
*** FIXME FIXME FIXME! If I understand --import correctly,
*** there should also be a check to prevent positional
*** arguments with --import. Can someone please confirm/deny?
Signed-off-by: Ed Santiago [email protected]