Skip to content

Fix race with concurrent daemon startup in tests - #35982

Merged
cpuguy83 merged 1 commit into
moby:masterfrom
cpuguy83:fix_concurrent_daemon_test_issues
Jan 11, 2018
Merged

cpuguy83 merged 1 commit into
moby:masterfrom
cpuguy83:fix_concurrent_daemon_test_issues

Conversation

@cpuguy83

@cpuguy83 cpuguy83 commented Jan 11, 2018 •

Copy link
Copy Markdown
Member

Using parallel tests is nice, however it can cause an issue with
multiple daemons trying to make changes to iptables at the same time
which causes flakey tests.

This just disables iptables for the set of tests since it is not
required.

Fixes #35914

@dnephin dnephin left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@vdemeester vdemeester left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM 🐯

Using parallel tests is nice, however it can cause an issue with
multiple daemons trying to make changes to iptables at the same time
which causes flakey tests.

This just disables iptables for the set of tests since it is not
required.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
@cpuguy83
cpuguy83 force-pushed the fix_concurrent_daemon_test_issues branch from 7dc1bda to 9e31938 Compare January 11, 2018 16:47
@cpuguy83

Copy link
Copy Markdown
Member Author

Fixed typo in commit message.

@cpuguy83
cpuguy83 merged commit 92309e3 into moby:master Jan 11, 2018
@cpuguy83
cpuguy83 deleted the fix_concurrent_daemon_test_issues branch January 11, 2018 19:26
@thaJeztah thaJeztah mentioned this pull request Aug 31, 2018
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.

5 participants