17.06 manager test fix#2683
Merged
Merged
Conversation
…ager), it may take a little while for the dispatcher to come up, so poll until it's up. In the second case (TestManagerLockUnlock), we wait for the TLS key bytes to change to test to see whether it has been decrypted after disabling the unlock key. However, it could have changed due to a renewal due to the previous unlock key rotation. So when polling, check that it's decrypted. Signed-off-by: Ying Li <ying.li@docker.com> (cherry picked from commit 6498260)
cyli
force-pushed
the
17.06-manager-test-fix
branch
from
1044885 to
9a60523
Compare
Codecov Report
@@ Coverage Diff @@
## bump_v17.06 #2683 +/- ##
===============================================
+ Coverage 61.08% 61.24% +0.16%
===============================================
Files 30 121 +91
Lines 4322 20172 +15850
===============================================
+ Hits 2640 12355 +9715
- Misses 1429 6462 +5033
- Partials 253 1355 +1102 |
anshulpundir
approved these changes
Jul 3, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Since 17.06 branch was changed, this re-backports the manager fixes from #2575 to fix manager test flakiness.