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

Merge pull request #26344 from tophj-ibm/change-test-daemon-id-generation

Browse Source 
Integration-cli: change daemon id generation from time to rand
Upstream-commit: 6ae6739af445ec59d9cb9f35f1729ab55a6d3f7a
Component: engine
This commit is contained in:
Brian Goff
2016-09-06 20:42:58 -04:00
committed by GitHub
parent 43e7345beb 02397cb234
commit 8f83f014e7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/integration-cli/daemon.go
View File

@ -17,6 +17,7 @@ import (
"github.com/docker/docker/opts"
"github.com/docker/docker/pkg/integration/checker"
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/engine-api/types/events"
"github.com/docker/go-connections/sockets"
"github.com/docker/go-connections/tlsconfig"
@ -61,7 +62,7 @@ func NewDaemon(c *check.C) *Daemon {
err := os.MkdirAll(daemonSockRoot, 0700)
c.Assert(err, checker.IsNil, check.Commentf("could not create daemon socket root"))
id := fmt.Sprintf("d%d", time.Now().UnixNano()%100000000)
id := fmt.Sprintf("d%s", stringid.TruncateID(stringid.GenerateRandomID()))
dir := filepath.Join(dest, id)
daemonFolder, err := filepath.Abs(dir)
c.Assert(err, check.IsNil, check.Commentf("Could not make %q an absolute path", dir))