docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hack: fix tests which didn't cleanup properly

This commit is contained in:
Solomon Hykes 2013-10-16 20:44:15 +00:00
parent 3a246ac3d1
commit acf58362cb
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
auth/auth_test.go
View File

@ -76,7 +76,7 @@ func TestCreateAccount(t *testing.T) {
} }
func setupTempConfigFile() (*ConfigFile, error) { func setupTempConfigFile() (*ConfigFile, error) {
root, err := ioutil.TempDir("", "docker-test") root, err := ioutil.TempDir("", "docker-test-auth")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -101,6 +101,7 @@ func TestSameAuthDataPostSave(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer os.RemoveAll(configFile.rootPath)
err = SaveConfig(configFile) err = SaveConfig(configFile)
if err != nil { if err != nil {
@ -127,6 +128,7 @@ func TestResolveAuthConfigIndexServer(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer os.RemoveAll(configFile.rootPath)
for _, registry := range []string{"", IndexServerAddress()} { for _, registry := range []string{"", IndexServerAddress()} {
resolved := configFile.ResolveAuthConfig(registry) resolved := configFile.ResolveAuthConfig(registry)
@ -141,6 +143,7 @@ func TestResolveAuthConfigFullURL(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer os.RemoveAll(configFile.rootPath)
registryAuth := AuthConfig{ registryAuth := AuthConfig{
Username: "foo-user", Username: "foo-user",

2
container_test.go
View File

@ -1189,7 +1189,7 @@ func BenchmarkRunParallel(b *testing.B) {
} }
func tempDir(t *testing.T) string { func tempDir(t *testing.T) string {
tmpDir, err := ioutil.TempDir("", "docker-test") tmpDir, err := ioutil.TempDir("", "docker-test-container")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }