kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Fix flaky test `TestGetContainerStatsRmRunning` 

Remove racey code to fix flaky test

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
This commit is contained in:
Zhang Wei 2016-01-30 11:27:27 +08:00
parent 5f5a752bcf
commit 9a9ce80a0f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
integration-cli/docker_api_containers_test.go
View File

@ -303,7 +303,7 @@ func (s *DockerSuite) TestGetContainerStatsRmRunning(c *check.C) {
buf := &integration.ChannelBuffer{make(chan []byte, 1)} buf := &integration.ChannelBuffer{make(chan []byte, 1)}
defer buf.Close() defer buf.Close()
chErr := make(chan error) chErr := make(chan error, 1)
go func() { go func() {
_, body, err := sockRequestRaw("GET", "/containers/"+id+"/stats?stream=1", nil, "application/json") _, body, err := sockRequestRaw("GET", "/containers/"+id+"/stats?stream=1", nil, "application/json")
if err != nil { if err != nil {
@ -314,7 +314,12 @@ func (s *DockerSuite) TestGetContainerStatsRmRunning(c *check.C) {
chErr <- err chErr <- err
}() }()
defer func() { defer func() {
c.Assert(<-chErr, checker.IsNil) select {
case err := <-chErr:
c.Assert(err, checker.IsNil)
default:
return
}
}() }()
b := make([]byte, 32) b := make([]byte, 32)
@ -327,10 +332,8 @@ func (s *DockerSuite) TestGetContainerStatsRmRunning(c *check.C) {
c.Assert(err, checker.Not(checker.IsNil), check.Commentf("rm should have failed but didn't")) c.Assert(err, checker.Not(checker.IsNil), check.Commentf("rm should have failed but didn't"))
_, err = buf.ReadTimeout(b, 2*time.Second) _, err = buf.ReadTimeout(b, 2*time.Second)
c.Assert(err, checker.IsNil) c.Assert(err, checker.IsNil)
dockerCmd(c, "rm", "-f", id)
_, err = buf.ReadTimeout(b, 2*time.Second) dockerCmd(c, "kill", id)
c.Assert(err, checker.Not(checker.IsNil))
} }
// regression test for gh13421 // regression test for gh13421