Merge pull request #79756 from draveness/feature/use-framework-expect-equal-in-e2e-test

feat: use framework.ExpectEqual in upgrades and windows e2e test
This commit is contained in:
Kubernetes Prow Robot
2019-07-05 20:34:34 -07:00
committed by GitHub
10 changed files with 18 additions and 21 deletions

View File

@@ -97,7 +97,7 @@ func checkNodeAllocatableTest(f *framework.Framework) {
ginkgo.By(fmt.Sprintf("Checking stated allocatable memory %v against calculated allocatable memory %v", &nodeMem.allocatable, calculatedNodeAlloc))
// sanity check against stated allocatable
gomega.Expect(calculatedNodeAlloc.Cmp(nodeMem.allocatable)).To(gomega.Equal(0))
framework.ExpectEqual(calculatedNodeAlloc.Cmp(nodeMem.allocatable), 0)
}
// Deploys `allocatablePods + 1` pods, each with a memory limit of `1/allocatablePods` of the total allocatable
@@ -277,7 +277,7 @@ func pollConfigz(timeout time.Duration, pollInterval time.Duration, nodeName str
output := string(buf[:n])
proxyRegexp := regexp.MustCompile("Starting to serve on 127.0.0.1:([0-9]+)")
match := proxyRegexp.FindStringSubmatch(output)
gomega.Expect(len(match)).To(gomega.Equal(2))
framework.ExpectEqual(len(match), 2)
port, err := strconv.Atoi(match[1])
framework.ExpectNoError(err)
ginkgo.By("http requesting node kubelet /configz")