github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 02:11:09 +00:00
Code Issues Projects Releases Wiki Activity

e2e: use framework.ExpectEqual() for test/e2e/network

Browse Source
This commit is contained in:
SataQiu 2019-07-05 11:05:09 +08:00
parent e12f96adc6
commit 5234f2e668
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/network/dns_common.go
View File

@ -549,7 +549,7 @@ func assertFilesContain(fileNames []string, fileDir string, pod *v1.Pod, client
e2elog.Logf("Lookups using %s/%s failed for: %v\n", pod.Namespace, pod.Name, failed)
return false, nil
}))
gomega.Expect(len(failed)).To(gomega.Equal(0))
framework.ExpectEqual(len(failed), 0)
}
func validateDNSResults(f *framework.Framework, pod *v1.Pod, fileNames []string) {

3
test/e2e/network/ingress.go
View File

@ -41,7 +41,6 @@ import (
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
)
const (
@ -341,7 +340,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
// ClusterIP ServicePorts have no NodePort
for _, sp := range svcPorts {
gomega.Expect(sp.NodePort).To(gomega.Equal(int32(0)))
framework.ExpectEqual(sp.NodePort, int32(0))
}
})

13
test/e2e/network/network_tiers.go
View File

@ -34,7 +34,6 @@ import (
gcecloud "k8s.io/legacy-cloud-providers/gce"
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
)
var _ = SIGDescribe("Services [Feature:GCEAlphaFeature][Slow]", func() {
@ -80,7 +79,7 @@ var _ = SIGDescribe("Services [Feature:GCEAlphaFeature][Slow]", func() {
// Verify that service has been updated properly.
svcTier, err := gcecloud.GetServiceNetworkTier(svc)
framework.ExpectNoError(err)
gomega.Expect(svcTier).To(gomega.Equal(cloud.NetworkTierStandard))
framework.ExpectEqual(svcTier, cloud.NetworkTierStandard)
// Record the LB name for test cleanup.
serviceLBNames = append(serviceLBNames, cloudprovider.DefaultLoadBalancerName(svc))
@ -95,7 +94,7 @@ var _ = SIGDescribe("Services [Feature:GCEAlphaFeature][Slow]", func() {
// Verify that service has been updated properly.
svcTier, err = gcecloud.GetServiceNetworkTier(svc)
framework.ExpectNoError(err)
gomega.Expect(svcTier).To(gomega.Equal(cloud.NetworkTierDefault))
framework.ExpectEqual(svcTier, cloud.NetworkTierDefault)
// Wait until the ingress IP changes. Each tier has its own pool of
// IPs, so changing tiers implies changing IPs.
@ -125,10 +124,10 @@ var _ = SIGDescribe("Services [Feature:GCEAlphaFeature][Slow]", func() {
setNetworkTier(svc, string(gcecloud.NetworkTierAnnotationStandard))
})
// Verify that service has been updated properly.
gomega.Expect(svc.Spec.LoadBalancerIP).To(gomega.Equal(requestedIP))
framework.ExpectEqual(svc.Spec.LoadBalancerIP, requestedIP)
svcTier, err = gcecloud.GetServiceNetworkTier(svc)
framework.ExpectNoError(err)
gomega.Expect(svcTier).To(gomega.Equal(cloud.NetworkTierStandard))
framework.ExpectEqual(svcTier, cloud.NetworkTierStandard)
// Wait until the ingress IP changes and verifies the LB.
ingressIP = waitAndVerifyLBWithTier(jig, ns, svcName, ingressIP, createTimeout, lagTimeout)
@ -153,7 +152,7 @@ func waitAndVerifyLBWithTier(jig *framework.ServiceTestJig, ns, svcName, existin
ginkgo.By("running sanity and reachability checks")
if svc.Spec.LoadBalancerIP != "" {
// Verify that the new ingress IP is the requested IP if it's set.
gomega.Expect(ingressIP).To(gomega.Equal(svc.Spec.LoadBalancerIP))
framework.ExpectEqual(ingressIP, svc.Spec.LoadBalancerIP)
}
jig.SanityCheckService(svc, v1.ServiceTypeLoadBalancer)
// If the IP has been used by previous test, sometimes we get the lingering
@ -166,7 +165,7 @@ func waitAndVerifyLBWithTier(jig *framework.ServiceTestJig, ns, svcName, existin
framework.ExpectNoError(err)
netTier, err := getLBNetworkTierByIP(ingressIP)
framework.ExpectNoError(err, "failed to get the network tier of the load balancer")
gomega.Expect(netTier).To(gomega.Equal(svcNetTier))
framework.ExpectEqual(netTier, svcNetTier)
return ingressIP
}

2
test/e2e/network/proxy.go
View File

@ -312,7 +312,7 @@ func nodeProxyTest(f *framework.Framework, prefix, nodeDest string) {
serviceUnavailableErrors++
} else {
framework.ExpectNoError(err)
gomega.Expect(status).To(gomega.Equal(http.StatusOK))
framework.ExpectEqual(status, http.StatusOK)
gomega.Expect(d).To(gomega.BeNumerically("<", proxyHTTPCallTimeout))
}
}

8
test/e2e/network/service.go
View File

@ -317,12 +317,12 @@ var _ = SIGDescribe("Services", func() {
ginkgo.By("Retrieve sourceip from a pod on the same node")
sourceIP1, execPodIP1 := execSourceipTest(f, cs, ns, node1.Name, serviceIP, servicePort)
ginkgo.By("Verifying the preserved source ip")
gomega.Expect(sourceIP1).To(gomega.Equal(execPodIP1))
framework.ExpectEqual(sourceIP1, execPodIP1)
ginkgo.By("Retrieve sourceip from a pod on a different node")
sourceIP2, execPodIP2 := execSourceipTest(f, cs, ns, node2.Name, serviceIP, servicePort)
ginkgo.By("Verifying the preserved source ip")
gomega.Expect(sourceIP2).To(gomega.Equal(execPodIP2))
framework.ExpectEqual(sourceIP2, execPodIP2)
})
ginkgo.It("should be able to up and down services", func() {
@ -1598,7 +1598,7 @@ var _ = SIGDescribe("Services", func() {
}
// should have the given static internal IP.
jig.SanityCheckService(svc, v1.ServiceTypeLoadBalancer)
gomega.Expect(framework.GetIngressPoint(lbIngress)).To(gomega.Equal(internalStaticIP))
framework.ExpectEqual(framework.GetIngressPoint(lbIngress), internalStaticIP)
}
ginkgo.By("switching to ClusterIP type to destroy loadbalancer")
@ -1648,7 +1648,7 @@ var _ = SIGDescribe("Services", func() {
if err != nil {
e2elog.Failf("gceCloud.GetHttpHealthCheck(%q) = _, %v; want nil", hcName, err)
}
gomega.Expect(hc.CheckIntervalSec).To(gomega.Equal(gceHcCheckIntervalSeconds))
framework.ExpectEqual(hc.CheckIntervalSec, gceHcCheckIntervalSeconds)
ginkgo.By("modify the health check interval")
hc.CheckIntervalSec = gceHcCheckIntervalSeconds - 1