From 0c36299c218268be084cb4c056ce2522588bae2a Mon Sep 17 00:00:00 2001
From: tanjunchen <2799194073@qq.com>
Date: Mon, 2 Dec 2019 11:20:42 +0800
Subject: [PATCH] Use expect equal test/e2e/upgrades

---
 test/e2e/upgrades/cassandra.go  | 7 +++----
 test/e2e/upgrades/etcd.go       | 7 +++----
 test/e2e/upgrades/mysql.go      | 3 +--
 test/e2e/upgrades/nvidia-gpu.go | 3 +--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/test/e2e/upgrades/cassandra.go b/test/e2e/upgrades/cassandra.go
index e81d7864629..2e3a06cb5e9 100644
--- a/test/e2e/upgrades/cassandra.go
+++ b/test/e2e/upgrades/cassandra.go
@@ -26,7 +26,6 @@ import (
 	"time"
 
 	"github.com/onsi/ginkgo"
-	"github.com/onsi/gomega"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/version"
@@ -200,19 +199,19 @@ func (t *CassandraUpgradeTest) Test(f *framework.Framework, done <-chan struct{}
 	}, 10*time.Millisecond, done)
 	framework.Logf("got %d users; want >=%d", lastUserCount, t.successfulWrites)
 
-	gomega.Expect(lastUserCount >= t.successfulWrites).To(gomega.BeTrue())
+	framework.ExpectEqual(lastUserCount >= t.successfulWrites, true)
 	ratio := float64(success) / float64(success+failures)
 	framework.Logf("Successful gets %d/%d=%v", success, success+failures, ratio)
 	ratio = float64(t.successfulWrites) / float64(writeAttempts)
 	framework.Logf("Successful writes %d/%d=%v", t.successfulWrites, writeAttempts, ratio)
 	framework.Logf("Errors: %v", errors)
 	// TODO(maisem): tweak this value once we have a few test runs.
-	gomega.Expect(ratio > 0.75).To(gomega.BeTrue())
+	framework.ExpectEqual(ratio > 0.75, true)
 }
 
 // Teardown does one final check of the data's availability.
 func (t *CassandraUpgradeTest) Teardown(f *framework.Framework) {
 	users, err := t.listUsers()
 	framework.ExpectNoError(err)
-	gomega.Expect(len(users) >= t.successfulWrites).To(gomega.BeTrue())
+	framework.ExpectEqual(len(users) >= t.successfulWrites, true)
 }
diff --git a/test/e2e/upgrades/etcd.go b/test/e2e/upgrades/etcd.go
index 2c44992c3a1..9d88c010f12 100644
--- a/test/e2e/upgrades/etcd.go
+++ b/test/e2e/upgrades/etcd.go
@@ -26,7 +26,6 @@ import (
 	"time"
 
 	"github.com/onsi/ginkgo"
-	"github.com/onsi/gomega"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/version"
@@ -188,19 +187,19 @@ func (t *EtcdUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upg
 	}, 10*time.Millisecond, done)
 	framework.Logf("got %d users; want >=%d", lastUserCount, t.successfulWrites)
 
-	gomega.Expect(lastUserCount >= t.successfulWrites).To(gomega.BeTrue())
+	framework.ExpectEqual(lastUserCount >= t.successfulWrites, true)
 	ratio := float64(success) / float64(success+failures)
 	framework.Logf("Successful gets %d/%d=%v", success, success+failures, ratio)
 	ratio = float64(t.successfulWrites) / float64(writeAttempts)
 	framework.Logf("Successful writes %d/%d=%v", t.successfulWrites, writeAttempts, ratio)
 	framework.Logf("Errors: %v", errors)
 	// TODO(maisem): tweak this value once we have a few test runs.
-	gomega.Expect(ratio > 0.75).To(gomega.BeTrue())
+	framework.ExpectEqual(ratio > 0.75, true)
 }
 
 // Teardown does one final check of the data's availability.
 func (t *EtcdUpgradeTest) Teardown(f *framework.Framework) {
 	users, err := t.listUsers()
 	framework.ExpectNoError(err)
-	gomega.Expect(len(users) >= t.successfulWrites).To(gomega.BeTrue())
+	framework.ExpectEqual(len(users) >= t.successfulWrites, true)
 }
diff --git a/test/e2e/upgrades/mysql.go b/test/e2e/upgrades/mysql.go
index 55d4a98e139..99d466d3b9e 100644
--- a/test/e2e/upgrades/mysql.go
+++ b/test/e2e/upgrades/mysql.go
@@ -26,7 +26,6 @@ import (
 	"time"
 
 	"github.com/onsi/ginkgo"
-	"github.com/onsi/gomega"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/version"
@@ -168,7 +167,7 @@ func (t *MySQLUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, up
 func (t *MySQLUpgradeTest) Teardown(f *framework.Framework) {
 	count, err := t.countNames()
 	framework.ExpectNoError(err)
-	gomega.Expect(count >= t.successfulWrites).To(gomega.BeTrue())
+	framework.ExpectEqual(count >= t.successfulWrites, true)
 }
 
 // addName adds a new value to the db.
diff --git a/test/e2e/upgrades/nvidia-gpu.go b/test/e2e/upgrades/nvidia-gpu.go
index 387975d8983..d11bcea035a 100644
--- a/test/e2e/upgrades/nvidia-gpu.go
+++ b/test/e2e/upgrades/nvidia-gpu.go
@@ -22,7 +22,6 @@ import (
 	"k8s.io/kubernetes/test/e2e/scheduling"
 
 	"github.com/onsi/ginkgo"
-	"github.com/onsi/gomega"
 )
 
 const (
@@ -54,7 +53,7 @@ func (t *NvidiaGPUUpgradeTest) Test(f *framework.Framework, done <-chan struct{}
 		// MasterUpgrade should be totally hitless.
 		job, err := jobutil.GetJob(f.ClientSet, f.Namespace.Name, "cuda-add")
 		framework.ExpectNoError(err)
-		gomega.Expect(job.Status.Failed).To(gomega.BeZero(), "Job pods failed during master upgrade: %v", job.Status.Failed)
+		framework.ExpectEqual(job.Status.Failed, 0, "Job pods failed during master upgrade: %v", job.Status.Failed)
 	}
 }