Skip to content

awslogs: replace channel-based mocks #43139

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

Merged
merged 2 commits into from
Jan 13, 2022
Merged

Conversation

samuelkarp
Copy link
Member

- What I did
awslogs: replace channel-based mocks

(related to #42690)

- How I did it
Rewrote the mock so tests define mock functions rather than specifying inputs and outputs via channels. This reduces the overall number and use of channels in the unit tests.

- How to verify it

GO111MODULE=off go test ./daemon/logger/awslogs

- Description for the changelog
N/A

Signed-off-by: Samuel Karp <skarp@amazon.com>
Signed-off-by: Samuel Karp <skarp@amazon.com>
@thaJeztah
Copy link
Member

Failure on win-2022/c8d is a known flaky; TestNetworkDBIslands #42459

Failure on win-2022 is unrelated, but seeing a lot of these recently, so leaving a comment here, in case it's specific tests that are more prone failing on this;

=== FAIL: github.com/docker/docker/integration-cli TestDockerSuite/TestInspectTemplateError (4.17s)
    check_test.go:170: assertion failed: error is not nil: Error response from daemon: container 85461ca939f9b77170803c9831a3298c4331af4625e7c6fa399410a5c7804f7f: driver "windowsfilter" failed to remove root filesystem: failed to detach VHD: failed to detach virtual disk: The device is not ready.: rename D:\CI\PR-43139\1\daemon\windowsfilter\85461ca939f9b77170803c9831a3298c4331af4625e7c6fa399410a5c7804f7f D:\CI\PR-43139\1\daemon\windowsfilter\85461ca939f9b77170803c9831a3298c4331af4625e7c6fa399410a5c7804f7f-removing: Access is denied.: failed to remove 85461ca939f9b77170803c9831a3298c4331af4625e7c6fa399410a5c7804f7f
    --- FAIL: TestDockerSuite/TestInspectTemplateError (4.17s)

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
Copy link
Member

windows failures are unrelated

@thaJeztah thaJeztah merged commit bf05144 into moby:master Jan 13, 2022
@thaJeztah thaJeztah added this to the 21.xx milestone Jan 13, 2022
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