main: add --progres (similar to bib) #21
Conversation
|
Very awesome and works for me; can we get rid of the |
mvo5
force-pushed
the
progress-silly-copied
branch
3 times, most recently
from
3bb8c3a to
bfaef9f
Compare
mvo5
changed the title
|
SRPM builds are failing due to the merge conflict in |
mvo5
force-pushed
the
progress-silly-copied
branch
from
f24ee7a to
46f31a9
Compare
This should fix that particular nit: osbuild/bootc-image-builder#810 I marked this ready for review now, it contains a sad commit with some duplicated container building code (small but still sad) but this should make it ready and it unblocks the |
I'm not too sad about it, knowing that it's hopefully temporary. Having the progress reporting is very nice. The test is failing due to no longer getting the |
Thanks, nice catch! I will need to update the test, the facts that we just forwarded stderr from osbuild unfiltered is a bit of a misfeature, I think for progress=term we can/should fix that, for progress=verbose I need to look, I think there should be compatibility code. |
The test is updated now, things are a little bit more complicated than I had hoped but its not too bad, the tests now nicely check for the error handling if osbuild fails which I think is a good thing (tm). |
mvo5
force-pushed
the
progress-silly-copied
branch
2 times, most recently
from
7c8b9ca to
863cfb7
Compare
This commit add progress reporting similar to what `bib` is doing. It imports the progress from `bootc-image-builder` for now. There is an open PR for moving this to images but there are some concerns about moving it there so for now we just use bib. This is not too bad because eventually bib and ibcli will merge.
This is a very sad commit, it copies the code to make a fake container with a faked osbuild. The bright side is that the plan is to rewrite these helpers in go and then we can just have a shared testutil module that can be imported from both bib/ibcli. And/or the two repos will merge and its just a (simple) test helper. But I do not feel good (at all) about this.
This commit checks that the `--progress` argument generates the expected output, i.e. with `term` we will not get any osbuild output and the spinner. And with `verbose` we will not get a spinner and the osbuild output.
This commit adds a new testutil.CaptureStdio helper so that we
can test external go modules that use os.Std{out,err} but now
allow mocking or overwriting.
This commit updates the tests for the error reporting. Since we are now using the new "progress" module we can no longer directly mock osStderr. So this now uses the new testutil helper `CaptureStdio`. Note also that the behavior of `verbose` and `term` is slightly different - for backward compatibility in `verbose` mode the stderr from osbuild is directly connected to the caller stderr. For term mode this is not done to prevent spurious message from leaking into the terminal progress and the full error is available from the actual go error as captured output.
mvo5
force-pushed
the
progress-silly-copied
branch
from
863cfb7 to
639d44e
Compare
[draft as this lacks tests, not easy to do right now without duplicating code from bib, looking into this]
This commit add progress reporting similar to what
bibis doing.It imports the progress from
bootc-image-builderfor now. Thereis an open PR for moving this to images but there are some
concerns about moving it there so for now we just use bib.
This is not too bad because eventually bib and ibcli will merge.