From f07d8d396fd7f964a7279a7611ee7d5cc8a6584c Mon Sep 17 00:00:00 2001 From: falser101 Date: Sun, 3 Jul 2022 20:56:59 +0800 Subject: [PATCH] fix:remove Redundant type conversion Signed-off-by: jianfei.zhang --- test/e2e/apimachinery/apply.go | 4 ++-- test/e2e/apimachinery/garbage_collector.go | 2 +- test/e2e/apimachinery/namespace.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/apimachinery/apply.go b/test/e2e/apimachinery/apply.go index 6d1cb1ebb58..a0f00e50c95 100644 --- a/test/e2e/apimachinery/apply.go +++ b/test/e2e/apimachinery/apply.go @@ -539,7 +539,7 @@ var _ = SIGDescribe("ServerSideApply", func() { Resource("deployments"). Name("deployment"). Param("fieldManager", "apply_test"). - Body([]byte(obj)).Do(context.TODO()).Get() + Body(obj).Do(context.TODO()).Get() if err == nil { framework.Failf("Expecting to get conflicts when applying object") } @@ -558,7 +558,7 @@ var _ = SIGDescribe("ServerSideApply", func() { Name("deployment"). Param("force", "true"). Param("fieldManager", "apply_test"). - Body([]byte(obj)).Do(context.TODO()).Get() + Body(obj).Do(context.TODO()).Get() if err != nil { framework.Failf("Failed to apply object with force: %v", err) } diff --git a/test/e2e/apimachinery/garbage_collector.go b/test/e2e/apimachinery/garbage_collector.go index 62b2915d6a2..4aa9112ddbd 100644 --- a/test/e2e/apimachinery/garbage_collector.go +++ b/test/e2e/apimachinery/garbage_collector.go @@ -737,7 +737,7 @@ var _ = SIGDescribe("Garbage collector", func() { rcClient := clientSet.CoreV1().ReplicationControllers(f.Namespace.Name) podClient := clientSet.CoreV1().Pods(f.Namespace.Name) rc1Name := "simpletest-rc-to-be-deleted" - replicas := int32(estimateMaximumPods(clientSet, 10, 100)) + replicas := estimateMaximumPods(clientSet, 10, 100) halfReplicas := int(replicas / 2) uniqLabelsDeleted := getUniqLabel("gctest_d", "valid_and_pending_owners_d") rc1 := newOwnerRC(f, rc1Name, replicas, uniqLabelsDeleted) diff --git a/test/e2e/apimachinery/namespace.go b/test/e2e/apimachinery/namespace.go index f14f490f421..c2eb0fc8eb2 100644 --- a/test/e2e/apimachinery/namespace.go +++ b/test/e2e/apimachinery/namespace.go @@ -56,7 +56,7 @@ func extinguish(f *framework.Framework, totalNS int, maxAllowedAfterDel int, max //Wait 10 seconds, then SEND delete requests for all the namespaces. ginkgo.By("Waiting 10 seconds") - time.Sleep(time.Duration(10 * time.Second)) + time.Sleep(10 * time.Second) deleteFilter := []string{"nslifetest"} deleted, err := framework.DeleteNamespaces(f.ClientSet, deleteFilter, nil /* skipFilter */) framework.ExpectNoError(err, "failed to delete namespace(s) containing: %s", deleteFilter) @@ -273,7 +273,7 @@ var _ = SIGDescribe("Namespaces [Serial]", func() { }, }) framework.ExpectNoError(err, "failed to marshal JSON patch data") - _, err = f.ClientSet.CoreV1().Namespaces().Patch(context.TODO(), namespaceName, types.StrategicMergePatchType, []byte(nspatch), metav1.PatchOptions{}) + _, err = f.ClientSet.CoreV1().Namespaces().Patch(context.TODO(), namespaceName, types.StrategicMergePatchType, nspatch, metav1.PatchOptions{}) framework.ExpectNoError(err, "failed to patch Namespace") ginkgo.By("get the Namespace and ensuring it has the label")