Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
7030dca4
Commit
7030dca4
authored
May 29, 2016
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
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
1 changed file
with
2 additions
and
2 deletions
+2
-2
testing.go
pkg/volume/testing/testing.go
+2
-2
No files found.
pkg/volume/testing/testing.go
View file @
7030dca4
...
...
@@ -18,7 +18,6 @@ package testing
import
(
"fmt"
"io/ioutil"
"os"
"os/exec"
"path"
...
...
@@ -35,6 +34,7 @@ import (
"k8s.io/kubernetes/pkg/util/io"
"k8s.io/kubernetes/pkg/util/mount"
utilstrings
"k8s.io/kubernetes/pkg/util/strings"
utiltesting
"k8s.io/kubernetes/pkg/util/testing"
.
"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
// a tmpfs filesystem on this system.
func
FindEmptyDirectoryUsageOnTmpfs
()
(
*
resource
.
Quantity
,
error
)
{
tmpDir
,
err
:=
ioutil
.
TempDir
(
os
.
TempDir
(),
"metrics_du_test"
)
tmpDir
,
err
:=
utiltesting
.
MkTmpdir
(
"metrics_du_test"
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment