test/e2e/:remove // TODO: write a wrapper for ExpectNoErrorWithOffset()

tanjunchen · tanjunchen · commit b5cdb6e6cb51 · 2020-03-01T23:00:11.000+08:00
diff --git a/test/e2e/apps/daemon_restart.go b/test/e2e/apps/daemon_restart.go
@@ -311,7 +311,6 @@ var _ = SIGDescribe("DaemonRestart [Disruptive]", func() {
 		if err != nil {
 			framework.Logf("Unexpected error occurred: %v", err)
 		}
-		// TODO: write a wrapper for ExpectNoErrorWithOffset()
 		framework.ExpectNoErrorWithOffset(0, err)
 		preRestarts, badNodes := getContainerRestarts(f.ClientSet, ns, labelSelector)
 		if preRestarts != 0 {
diff --git a/test/e2e/autoscaling/cluster_size_autoscaling.go b/test/e2e/autoscaling/cluster_size_autoscaling.go
@@ -1241,7 +1241,6 @@ func getPoolNodes(f *framework.Framework, poolName string) []*v1.Node {
 	if err != nil {
 		framework.Logf("Unexpected error occurred: %v", err)
 	}
-	// TODO: write a wrapper for ExpectNoErrorWithOffset()
 	framework.ExpectNoErrorWithOffset(0, err)
 	for _, node := range nodeList.Items {
 		if node.Labels[gkeNodepoolNameKey] == poolName {
diff --git a/test/e2e/cloud/nodes.go b/test/e2e/cloud/nodes.go
@@ -52,7 +52,6 @@ var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() {
 		if err != nil {
 			framework.Logf("Unexpected error occurred: %v", err)
 		}
-		// TODO: write a wrapper for ExpectNoErrorWithOffset()
 		framework.ExpectNoErrorWithOffset(0, err)
 
 		framework.Logf("Original number of ready nodes: %d", len(origNodes.Items))
diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go
@@ -106,7 +106,6 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
 			framework.Logf("Unexpected error occurred: %v", err)
 		}
 
-		// TODO: write a wrapper for ExpectNoErrorWithOffset()
 		framework.ExpectNoErrorWithOffset(0, err)
 
 		err = framework.CheckTestingNSDeletedExcept(cs, ns)
diff --git a/test/e2e/scheduling/preemption.go b/test/e2e/scheduling/preemption.go
@@ -92,7 +92,6 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
 		if err != nil {
 			framework.Logf("Unexpected error occurred: %v", err)
 		}
-		// TODO: write a wrapper for ExpectNoErrorWithOffset()
 		framework.ExpectNoErrorWithOffset(0, err)
 
 		err = framework.CheckTestingNSDeletedExcept(cs, ns)
diff --git a/test/e2e/scheduling/priorities.go b/test/e2e/scheduling/priorities.go
@@ -148,7 +148,6 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() {
 		if err != nil {
 			framework.Logf("Unexpected error occurred: %v", err)
 		}
-		// TODO: write a wrapper for ExpectNoErrorWithOffset()
 		framework.ExpectNoErrorWithOffset(0, err)
 
 		err = framework.CheckTestingNSDeletedExcept(cs, ns)

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,6 @@ var _ = SIGDescribe("DaemonRestart [Disruptive]", func() {`
`311`	`311`	`if err != nil {`
`312`	`312`	`framework.Logf("Unexpected error occurred: %v", err)`
`313`	`313`	`}`
`314`		`- // TODO: write a wrapper for ExpectNoErrorWithOffset()`
`315`	`314`	`framework.ExpectNoErrorWithOffset(0, err)`
`316`	`315`	`preRestarts, badNodes := getContainerRestarts(f.ClientSet, ns, labelSelector)`
`317`	`316`	`if preRestarts != 0 {`
Original file line number	Diff line number	Diff line change
`@@ -1241,7 +1241,6 @@ func getPoolNodes(f framework.Framework, poolName string) []v1.Node {`
`1241`	`1241`	`if err != nil {`
`1242`	`1242`	`framework.Logf("Unexpected error occurred: %v", err)`
`1243`	`1243`	`}`
`1244`		`- // TODO: write a wrapper for ExpectNoErrorWithOffset()`
`1245`	`1244`	`framework.ExpectNoErrorWithOffset(0, err)`
`1246`	`1245`	`for _, node := range nodeList.Items {`
`1247`	`1246`	`if node.Labels[gkeNodepoolNameKey] == poolName {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() {`
`52`	`52`	`if err != nil {`
`53`	`53`	`framework.Logf("Unexpected error occurred: %v", err)`
`54`	`54`	`}`
`55`		`- // TODO: write a wrapper for ExpectNoErrorWithOffset()`
`56`	`55`	`framework.ExpectNoErrorWithOffset(0, err)`
`57`	`56`
`58`	`57`	`framework.Logf("Original number of ready nodes: %d", len(origNodes.Items))`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,6 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {`
`106`	`106`	`framework.Logf("Unexpected error occurred: %v", err)`
`107`	`107`	`}`
`108`	`108`
`109`		`- // TODO: write a wrapper for ExpectNoErrorWithOffset()`
`110`	`109`	`framework.ExpectNoErrorWithOffset(0, err)`
`111`	`110`
`112`	`111`	`err = framework.CheckTestingNSDeletedExcept(cs, ns)`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,6 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {`
`92`	`92`	`if err != nil {`
`93`	`93`	`framework.Logf("Unexpected error occurred: %v", err)`
`94`	`94`	`}`
`95`		`- // TODO: write a wrapper for ExpectNoErrorWithOffset()`
`96`	`95`	`framework.ExpectNoErrorWithOffset(0, err)`
`97`	`96`
`98`	`97`	`err = framework.CheckTestingNSDeletedExcept(cs, ns)`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,6 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() {`
`148`	`148`	`if err != nil {`
`149`	`149`	`framework.Logf("Unexpected error occurred: %v", err)`
`150`	`150`	`}`
`151`		`- // TODO: write a wrapper for ExpectNoErrorWithOffset()`
`152`	`151`	`framework.ExpectNoErrorWithOffset(0, err)`
`153`	`152`
`154`	`153`	`err = framework.CheckTestingNSDeletedExcept(cs, ns)`