github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

e2e-test logf instead framework.logf

k3s-v1.15.3
loic le dru 2019-05-10 14:18:55 +02:00
parent 8fecbd8eca
commit 61731dd1d1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/cloud/BUILD
View File

@ -13,6 +13,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//test/e2e/framework:go_default_library", "//test/e2e/framework:go_default_library",
"//test/e2e/framework/log:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library",
], ],

3
test/e2e/cloud/nodes.go
View File

@ -23,6 +23,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
"github.com/onsi/gomega" "github.com/onsi/gomega"
@ -46,7 +47,7 @@ var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() {
nodeToDelete := nodeDeleteCandidates.Items[0] nodeToDelete := nodeDeleteCandidates.Items[0]
origNodes := framework.GetReadyNodesIncludingTaintedOrDie(c) origNodes := framework.GetReadyNodesIncludingTaintedOrDie(c)
framework.Logf("Original number of ready nodes: %d", len(origNodes.Items)) e2elog.Logf("Original number of ready nodes: %d", len(origNodes.Items))
err := framework.DeleteNodeOnCloudProvider(&nodeToDelete) err := framework.DeleteNodeOnCloudProvider(&nodeToDelete)
if err != nil { if err != nil {