update import

This commit is contained in:
ymqytw
2017-07-18 22:58:53 -07:00
parent 088141ca3a
commit 3dfc8bf7f3
83 changed files with 464 additions and 449 deletions

View File

@@ -28,10 +28,11 @@ import (
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/kubernetes/pkg/util/exec"
"k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/empty_dir"
volumetest "k8s.io/kubernetes/pkg/volume/testing"
"k8s.io/utils/exec"
fakeexec "k8s.io/utils/exec/testing"
)
func newTestHost(t *testing.T) (string, volume.VolumeHost) {
@@ -320,8 +321,8 @@ func doTestSetUp(scenario struct {
allErrs := []error{}
// Construct combined outputs from expected commands
var fakeOutputs []exec.FakeCombinedOutputAction
var fcmd exec.FakeCmd
var fakeOutputs []fakeexec.FakeCombinedOutputAction
var fcmd fakeexec.FakeCmd
for _, expected := range expecteds {
if expected.cmd[1] == "clone" {
fakeOutputs = append(fakeOutputs, func() ([]byte, error) {
@@ -336,19 +337,19 @@ func doTestSetUp(scenario struct {
})
}
}
fcmd = exec.FakeCmd{
fcmd = fakeexec.FakeCmd{
CombinedOutputScript: fakeOutputs,
}
// Construct fake exec outputs from fcmd
var fakeAction []exec.FakeCommandAction
var fakeAction []fakeexec.FakeCommandAction
for i := 0; i < len(expecteds); i++ {
fakeAction = append(fakeAction, func(cmd string, args ...string) exec.Cmd {
return exec.InitFakeCmd(&fcmd, cmd, args...)
return fakeexec.InitFakeCmd(&fcmd, cmd, args...)
})
}
fake := exec.FakeExec{
fake := fakeexec.FakeExec{
CommandScript: fakeAction,
}