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

Merge pull request #8998 from yoheiueda/dont-remove-tmpdir 

Fix the unit test not to remove /tmp
This commit is contained in:
Alexandr Morozov 2014-11-06 08:59:02 -08:00
parent b35a0ba81b 2329354dc3
commit ff911d5f34
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/parsers/operatingsystem/operatingsystem_test.go
View File

@ -38,12 +38,13 @@ BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/"`)
) )
dir := os.TempDir() dir := os.TempDir()
etcOsRelease = filepath.Join(dir, "etcOsRelease")
defer func() { defer func() {
os.Remove(etcOsRelease)
etcOsRelease = backup etcOsRelease = backup
os.RemoveAll(dir)
}() }()
etcOsRelease = filepath.Join(dir, "etcOsRelease")
for expect, osRelease := range map[string][]byte{ for expect, osRelease := range map[string][]byte{
"Ubuntu 14.04 LTS": ubuntuTrusty, "Ubuntu 14.04 LTS": ubuntuTrusty,
"Gentoo/Linux": gentoo, "Gentoo/Linux": gentoo,
@ -92,13 +93,13 @@ func TestIsContainerized(t *testing.T) {
) )
dir := os.TempDir() dir := os.TempDir()
defer func() {
proc1Cgroup = backup
os.RemoveAll(dir)
}()
proc1Cgroup = filepath.Join(dir, "proc1Cgroup") proc1Cgroup = filepath.Join(dir, "proc1Cgroup")
defer func() {
os.Remove(proc1Cgroup)
proc1Cgroup = backup
}()
if err := ioutil.WriteFile(proc1Cgroup, nonContainerizedProc1Cgroup, 0600); err != nil { if err := ioutil.WriteFile(proc1Cgroup, nonContainerizedProc1Cgroup, 0600); err != nil {
t.Fatalf("failed to write to %s: %v", proc1Cgroup, err) t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
} }