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

Fix race condition in API commit test

Browse Source 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: cd4f507b42e800d148b211ca2c780d01192a9041
Component: engine
This commit is contained in:
Doug Davis
2015-04-25 05:46:47 -07:00
parent de733ff8fe
commit 478eada080
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/integration-cli/docker_api_containers_test.go
View File

@ -614,14 +614,14 @@ func (s *DockerSuite) TestContainerApiTop(c *check.C) {
}
func (s *DockerSuite) TestContainerApiCommit(c *check.C) {
out, err := exec.Command(dockerBinary, "run", "-d", "busybox", "/bin/sh", "-c", "touch /test").CombinedOutput()
cName := "testapicommit"
out, err := exec.Command(dockerBinary, "run", "--name="+cName, "busybox", "/bin/sh", "-c", "touch /test").CombinedOutput()
if err != nil {
c.Fatal(err, out)
}
id := strings.TrimSpace(string(out))
name := "testcommit" + stringid.GenerateRandomID()
status, b, err := sockRequest("POST", "/commit?repo="+name+"&testtag=tag&container="+id, nil)
status, b, err := sockRequest("POST", "/commit?repo="+name+"&testtag=tag&container="+cName, nil)
c.Assert(status, check.Equals, http.StatusCreated)
c.Assert(err, check.IsNil)