Merge pull request #67412 from tanshanshan/little815

fix test log info

Kubernetes-commit: b9468c7084573bb87f2a8c3b2b6df41b8f136b04
This commit is contained in:
Kubernetes Publisher 2018-10-12 19:13:14 -07:00
commit 7571b2924a
2 changed files with 36 additions and 36 deletions

64
Godeps/Godeps.json generated
View File

@ -272,131 +272,131 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta2",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/coordination/v1beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/scheduling/v1beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "e411bbba420713f83a2572c37d81add52d63857c"
"Rev": "f0372b674713244ff8634990ab0ce45742a05d86"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",

View File

@ -68,16 +68,16 @@ func TestUpdateSymlinkNewFileNotExist(t *testing.T) {
pairNamePrefix: "kubelet",
}
if err := s.updateSymlink(oldPairFile); err != nil {
t.Errorf("Got %v, wanted successful update of the symlink to point to %q", err, oldPairFile)
t.Errorf("Got error %v, wanted successful update of the symlink to point to %q", err, oldPairFile)
}
if _, err := os.Stat(oldPairFile); err != nil {
t.Errorf("Got %v, wanted file %q to be there.", oldPairFile, err)
t.Errorf("Got error %v, wanted file %q to be there.", err, oldPairFile)
}
currentPairFile := filepath.Join(dir, "kubelet-current.pem")
if fi, err := os.Lstat(currentPairFile); err != nil {
t.Errorf("Got %v, wanted file %q to be there", currentPairFile, err)
t.Errorf("Got error %v, wanted file %q to be there", err, currentPairFile)
} else if fi.Mode()&os.ModeSymlink != os.ModeSymlink {
t.Errorf("Got %q not a symlink.", currentPairFile)
}
@ -112,7 +112,7 @@ func TestUpdateSymlinkNoSymlink(t *testing.T) {
}
if _, err := os.Stat(pairFile); err != nil {
t.Errorf("Got error %v, wanted file %q to be there", pairFile, err)
t.Errorf("Got error %v, wanted file %q to be there", err, pairFile)
}
currentPairFile := filepath.Join(dir, "kubelet-current.pem")
if fi, err := os.Lstat(currentPairFile); err != nil {