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

Merge pull request #20817 from tiborvass/skip-TestStatsAllNewContainersAdded-remote-daemon

Browse Source 
Skip TestStatsAllNewContainersAdded on remote daemons
Upstream-commit: 32d1a6cee544b0609be4ad8b07dc1794f06b431e
Component: engine
This commit is contained in:
David Calavera
2016-03-01 13:10:44 -08:00
parent f87c5bb0dc e39ff2ff2f
commit 65f83ffaae
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_stats_test.go
+4 -1
View File
@@ -97,7 +97,10 @@ func (s *DockerSuite) TestStatsAllNoStream(c *check.C) {
func (s *DockerSuite) TestStatsAllNewContainersAdded(c *check.C) {
// Windows does not support stats
testRequires(c, DaemonIsLinux)
// 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)
id := make(chan string)
addedChan := make(chan struct{})