github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 06:01:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #56911 from WanLinghao/projected_test_fix

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 56650, 55813, 56911, 56921, 56871). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

fix deviceplugin test file create leak file problem

When execute make test, this test file will create a file named "kubelet_internal_checkpoint" in k8s directory and not delete it.

This patch fix this error




**What this PR does / why we need it**:

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #56365

**Special notes for your reviewer**:

**Release note**:

```release-note

```
This commit is contained in:
Kubernetes Submit Queue
2017-12-16 12:10:48 -08:00
committed by GitHub
parent 7045364274 3e7e4ab397
commit a902959544
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubelet/cm/deviceplugin/manager_test.go
View File

@@ -19,6 +19,8 @@ package deviceplugin
import ( import (
"flag" "flag"
"fmt" "fmt"
"io/ioutil"
"os"
"reflect" "reflect"
"sync/atomic" "sync/atomic"
"testing" "testing"
@@ -262,7 +264,12 @@ func TestCheckpoint(t *testing.T) {
resourceName1 := "domain1.com/resource1" resourceName1 := "domain1.com/resource1"
resourceName2 := "domain2.com/resource2" resourceName2 := "domain2.com/resource2"
as := assert.New(t)
tmpDir, err := ioutil.TempDir("", "checkpoint")
as.Nil(err)
defer os.RemoveAll(tmpDir)
testManager := &ManagerImpl{ testManager := &ManagerImpl{
socketdir: tmpDir,
allDevices: make(map[string]sets.String), allDevices: make(map[string]sets.String),
allocatedDevices: make(map[string]sets.String), allocatedDevices: make(map[string]sets.String),
podDevices: make(podDevices), podDevices: make(podDevices),
@@ -301,8 +308,7 @@ func TestCheckpoint(t *testing.T) {
expectedAllocatedDevices := testManager.podDevices.devices() expectedAllocatedDevices := testManager.podDevices.devices()
expectedAllDevices := testManager.allDevices expectedAllDevices := testManager.allDevices
err := testManager.writeCheckpoint() err = testManager.writeCheckpoint()
as := assert.New(t)
as.Nil(err) as.Nil(err)
testManager.podDevices = make(podDevices) testManager.podDevices = make(podDevices)
@@ -388,7 +394,11 @@ func TestPodContainerDeviceAllocation(t *testing.T) {
nodeInfo := &schedulercache.NodeInfo{} nodeInfo := &schedulercache.NodeInfo{}
nodeInfo.SetNode(cachedNode) nodeInfo.SetNode(cachedNode)
tmpDir, err := ioutil.TempDir("", "checkpoint")
as.Nil(err)
defer os.RemoveAll(tmpDir)
testManager := &ManagerImpl{ testManager := &ManagerImpl{
socketdir: tmpDir,
callback: monitorCallback, callback: monitorCallback,
allDevices: make(map[string]sets.String), allDevices: make(map[string]sets.String),
allocatedDevices: make(map[string]sets.String), allocatedDevices: make(map[string]sets.String),
@@ -489,7 +499,7 @@ func TestPodContainerDeviceAllocation(t *testing.T) {
} }
podsStub.updateActivePods([]*v1.Pod{pod}) podsStub.updateActivePods([]*v1.Pod{pod})
err := testManager.Allocate(nodeInfo, &lifecycle.PodAdmitAttributes{Pod: pod}) err = testManager.Allocate(nodeInfo, &lifecycle.PodAdmitAttributes{Pod: pod})
as.Nil(err) as.Nil(err)
runContainerOpts := testManager.GetDeviceRunContainerOptions(pod, &pod.Spec.Containers[0]) runContainerOpts := testManager.GetDeviceRunContainerOptions(pod, &pod.Spec.Containers[0])
as.NotNil(runContainerOpts) as.NotNil(runContainerOpts)