toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #20835 from cpuguy83/handle_stats_client_errors

Browse Source 
Do not remove containers from stats list on err
Upstream-commit: 5314296c693d0d4d7f622940b48bc15e400032e3
Component: engine
This commit is contained in:
Doug Davis
2016-04-16 10:20:58 +01:00
parent f32c486767 90af4a019b
commit 145eac88d4
4 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_stats_test.go
+1 -4
View File
@@ -120,10 +120,7 @@ func (s *DockerSuite) TestStatsAllNoStream(c *check.C) {
func (s *DockerSuite) TestStatsAllNewContainersAdded(c *check.C) {
// Windows does not support stats
// TODO: remove SameHostDaemon
// The reason it was added is because, there seems to be some race that makes this test fail
// for remote daemons (namely in the win2lin CI). We highly welcome contributions to fix this.
testRequires(c, DaemonIsLinux, SameHostDaemon)
testRequires(c, DaemonIsLinux)
id := make(chan string)
addedChan := make(chan struct{})