Merge pull request #15475 from jijun2/fix-cni_test

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-20 01:30:24 -07:00
8 changed files with 189 additions and 49 deletions

View File

@@ -17,6 +17,8 @@ limitations under the License.
package kubelet
import (
"io/ioutil"
"os"
"testing"
"time"
@@ -36,9 +38,13 @@ func TestRunOnce(t *testing.T) {
podManager := kubepod.NewBasicPodManager(kubepod.NewFakeMirrorClient())
diskSpaceManager, _ := newDiskSpaceManager(cadvisor, DiskSpacePolicy{})
fakeRuntime := &kubecontainer.FakeRuntime{}
basePath, err := ioutil.TempDir(os.TempDir(), "kubelet")
if err != nil {
t.Fatalf("can't make a temp rootdir %v", err)
}
defer os.RemoveAll(basePath)
kb := &Kubelet{
rootDirectory: "/tmp/kubelet",
rootDirectory: basePath,
recorder: &record.FakeRecorder{},
cadvisor: cadvisor,
nodeLister: testNodeLister{},