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

Hack: fix tests which didn't cleanup properly

Browse Source 
Upstream-commit: acf58362cb957bf4d02af460935a9c5febd112f4
Component: engine
This commit is contained in:
Solomon Hykes
2013-10-16 20:44:15 +00:00
parent e0dfea89d2
commit 64572038db
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/auth/auth_test.go
+4 -1
View File
@@ -76,7 +76,7 @@ func TestCreateAccount(t *testing.T) {
}
func setupTempConfigFile() (*ConfigFile, error) {
root, err := ioutil.TempDir("", "docker-test")
root, err := ioutil.TempDir("", "docker-test-auth")
if err != nil {
return nil, err
}
@@ -101,6 +101,7 @@ func TestSameAuthDataPostSave(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(configFile.rootPath)
err = SaveConfig(configFile)
if err != nil {
@@ -127,6 +128,7 @@ func TestResolveAuthConfigIndexServer(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(configFile.rootPath)
for _, registry := range []string{"", IndexServerAddress()} {
resolved := configFile.ResolveAuthConfig(registry)
@@ -141,6 +143,7 @@ func TestResolveAuthConfigFullURL(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(configFile.rootPath)
registryAuth := AuthConfig{
Username: "foo-user",
components/engine/container_test.go
+1 -1
View File
@@ -1189,7 +1189,7 @@ func BenchmarkRunParallel(b *testing.B) {
}
func tempDir(t *testing.T) string {
tmpDir, err := ioutil.TempDir("", "docker-test")
tmpDir, err := ioutil.TempDir("", "docker-test-container")
if err != nil {
t.Fatal(err)
}