github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88930 from oomichi/Failf

Browse Source 
Replace ExpectNoError(fmt.Errorf(..)) with funcs
This commit is contained in:
Kubernetes Prow Robot
2020-03-17 19:28:20 -07:00
committed by GitHub
parent ed4c2dbf92 75ca65806d
commit b88ea8d2bb
5 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/upgrades/apps/deployments.go
View File

@@ -79,9 +79,7 @@ func (t *DeploymentUpgradeTest) Setup(f *framework.Framework) {
rsList, err := rsClient.List(context.TODO(), metav1.ListOptions{LabelSelector: rsSelector.String()})
framework.ExpectNoError(err)
rss := rsList.Items
if len(rss) != 1 {
framework.ExpectNoError(fmt.Errorf("expected one replicaset, got %d", len(rss)))
}
framework.ExpectEqual(len(rss), 1, "expected one replicaset, got %d", len(rss))
t.oldRSUID = rss[0].UID
ginkgo.By(fmt.Sprintf("Waiting for revision of the deployment %q to become 1", deploymentName))
@@ -101,9 +99,7 @@ func (t *DeploymentUpgradeTest) Setup(f *framework.Framework) {
rsList, err = rsClient.List(context.TODO(), metav1.ListOptions{LabelSelector: rsSelector.String()})
framework.ExpectNoError(err)
rss = rsList.Items
if len(rss) != 2 {
framework.ExpectNoError(fmt.Errorf("expected 2 replicaset, got %d", len(rss)))
}
framework.ExpectEqual(len(rss), 2, "expected 2 replicaset, got %d", len(rss))
ginkgo.By(fmt.Sprintf("Checking replicaset of deployment %q that is created before rollout survives the rollout", deploymentName))
switch t.oldRSUID {
@@ -144,9 +140,7 @@ func (t *DeploymentUpgradeTest) Test(f *framework.Framework, done <-chan struct{
rsList, err := rsClient.List(context.TODO(), metav1.ListOptions{LabelSelector: rsSelector.String()})
framework.ExpectNoError(err)
rss := rsList.Items
if len(rss) != 2 {
framework.ExpectNoError(fmt.Errorf("expected 2 replicaset, got %d", len(rss)))
}
framework.ExpectEqual(len(rss), 2, "expected 2 replicaset, got %d", len(rss))
switch t.oldRSUID {
case rss[0].UID: