Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[27.x backport] cli/command/container: set empty args in tests and discard output #5564

Conversation

austinvazquez
Copy link
Contributor

- What I did
Backports #5534 to 27.x branch

- How I did it

git cherry-pick -xsS 3b38dc67be367589c1d58000413d8f66d4670c1c
git cherry-pick -xsS 35d7b1a7a6426080f44e044b6564cee990b35eab

- Description for the changelog

n/a

- A picture of a cute animal (not mandatory but encouraged)

Prevent some tests from failing when running from a pre-compiled
testbinary, and discard output to make the output less noisy.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 3b38dc6)
Signed-off-by: Austin Vazquez <[email protected]>
    === RUN   TestWaitExitOrRemoved
    === RUN   TestWaitExitOrRemoved/normal-container
    === RUN   TestWaitExitOrRemoved/give-me-exit-code-42
    === RUN   TestWaitExitOrRemoved/i-want-a-wait-error
    time="2024-10-13T18:48:14+02:00" level=error msg="Error waiting for container: removal failed"
    === RUN   TestWaitExitOrRemoved/non-existent-container-id
    time="2024-10-13T18:48:14+02:00" level=error msg="error waiting for container: no such container: non-existent-container-id"
    --- PASS: TestWaitExitOrRemoved (0.00s)
        --- PASS: TestWaitExitOrRemoved/normal-container (0.00s)
        --- PASS: TestWaitExitOrRemoved/give-me-exit-code-42 (0.00s)
        --- PASS: TestWaitExitOrRemoved/i-want-a-wait-error (0.00s)
        --- PASS: TestWaitExitOrRemoved/non-existent-container-id (0.00s)
    PASS

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 35d7b1a)
Signed-off-by: Austin Vazquez <[email protected]>
@codecov-commenter
Copy link

codecov-commenter commented Oct 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 58.65%. Comparing base (dc36908) to head (df7e6e5).
Report is 6 commits behind head on 27.x.

Additional details and impacted files
@@           Coverage Diff           @@
##             27.x    #5564   +/-   ##
=======================================
  Coverage   58.65%   58.65%           
=======================================
  Files         345      345           
  Lines       29042    29042           
=======================================
  Hits        17035    17035           
  Misses      11036    11036           
  Partials      971      971           

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah thaJeztah merged commit 79113a3 into docker:27.x Oct 21, 2024
96 checks passed
@austinvazquez austinvazquez deleted the cherry-pick-35d7b1a7a6426080f44e044b6564cee990b35eab-to-27.x branch October 22, 2024 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants