[backport 20.10] TestDaemonRestartKillContainers: Fix races #45197
+16
−17
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.
TestDaemonRestartKillContainers: Fix loop capture
TestDaemonRestartKillContainers test was always executing the last case (
container created should not be restarted
) because the iterated variables were not copied correctly.Capture iterated values by value correctly.
StartWithLogFile: Fix d.cmd race
Use
exec.Command
created by this function instead of obtaining it from daemon struct. This prevents a race condition wheredaemon.Kill
is called before the goroutine has the chance to callcmd.Wait
.Detected by
-race
:- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)
