Fixes #11721 removed GenerateRandomString

Signed-off-by: Peter Esbensen <pkesbensen@gmail.com>

gofmt

Signed-off-by: Peter Esbensen <pkesbensen@gmail.com>
Upstream-commit: 6896016b7c7a95ac33c77a222c359cf35a471eb9
Component: engine
This commit is contained in:
Peter Esbensen
2015-04-01 07:21:07 -07:00
parent aa32736c19
commit 64b84b5716
4 changed files with 6 additions and 41 deletions

View File

@ -24,7 +24,7 @@ import (
"github.com/docker/docker/pkg/fileutils"
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/jsonmessage"
"github.com/docker/docker/pkg/stringutils"
"github.com/docker/docker/pkg/stringid"
)
type KeyValuePair struct {
@ -313,7 +313,7 @@ var globalTestID string
// new directory.
func TestDirectory(templateDir string) (dir string, err error) {
if globalTestID == "" {
globalTestID = stringutils.GenerateRandomString()[:4]
globalTestID = stringid.GenerateRandomID()[:4]
}
prefix := fmt.Sprintf("docker-test%s-%s-", globalTestID, GetCallerName(2))
if prefix == "" {