github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #25989 from jingxu97/bug-tmpdir 

Automatic merge from submit-queue

use MkTmpDir instead of ioutil.TempDir in testing

fixes #20243
pull/6/head
k8s-merge-robot 2016-05-29 06:32:36 -07:00
parent feee4834c8 ffac5d73f6
commit 7030dca4c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/testing/testing.go
View File

@ -18,7 +18,6 @@ package testing
import ( import (
"fmt" "fmt"
"io/ioutil"
"os" "os"
"os/exec" "os/exec"
"path" "path"
@ -35,6 +34,7 @@ import (
"k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/io"
"k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/mount"
utilstrings "k8s.io/kubernetes/pkg/util/strings" utilstrings "k8s.io/kubernetes/pkg/util/strings"
utiltesting "k8s.io/kubernetes/pkg/util/testing"
. "k8s.io/kubernetes/pkg/volume" . "k8s.io/kubernetes/pkg/volume"
) )
@ -457,7 +457,7 @@ func (fc *FakeProvisioner) Provision() (*api.PersistentVolume, error) {
// FindEmptyDirectoryUsageOnTmpfs finds the expected usage of an empty directory existing on // FindEmptyDirectoryUsageOnTmpfs finds the expected usage of an empty directory existing on
// a tmpfs filesystem on this system. // a tmpfs filesystem on this system.
func FindEmptyDirectoryUsageOnTmpfs() (*resource.Quantity, error) { func FindEmptyDirectoryUsageOnTmpfs() (*resource.Quantity, error) {
tmpDir, err := ioutil.TempDir(os.TempDir(), "metrics_du_test") tmpDir, err := utiltesting.MkTmpdir("metrics_du_test")
if err != nil { if err != nil {
return nil, err return nil, err
} }