Skip to content

K
k3s
Commit 7030dca4 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #25989 from jingxu97/bug-tmpdir

Automatic merge from submit-queue use MkTmpDir instead of ioutil.TempDir in testing fixes #20243
parents feee4834 ffac5d73
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/volume/testing/testing.go
View file @ 7030dca4
...@@ -18,7 +18,6 @@ package testing ...@@ -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 ( ...@@ -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) { ...@@ -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
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment