karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3008 from Fish-pro/infoffmt 

Remove unnecessary fmt.Sprintf for logging
This commit is contained in:
karmada-bot 2022-12-30 09:25:51 +08:00 committed by GitHub
parent 434b7b6578 4699343bcf
commit 4d9b23ff72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/mcs_test.go
View File

@ -419,7 +419,7 @@ var _ = ginkgo.Describe("Multi-Cluster Service testing", func() {
}, pollTimeout, pollInterval).Should(gomega.Equal(1))
})
klog.Infof(fmt.Sprintf("Update Deployment's replicas in %s cluster", serviceExportClusterName))
klog.Infof("Update Deployment's replicas in %s cluster", serviceExportClusterName)
framework.UpdateDeploymentReplicas(exportClusterClient, &demoDeployment, 2)
ginkgo.By(fmt.Sprintf("Wait EndpointSlice update in %s cluster", serviceImportClusterName), func() {

13
test/e2e/resourceinterpreter_test.go
View File

@ -3,7 +3,6 @@ package e2e
import (
"context"
"encoding/json"
"fmt"
"reflect"
"time"
@ -73,8 +72,8 @@ var _ = ginkgo.Describe("Resource interpreter webhook testing", func() {
resourceBinding, err := karmadaClient.WorkV1alpha2().ResourceBindings(workload.Namespace).Get(context.TODO(), resourceBindingName, metav1.GetOptions{})
g.Expect(err).NotTo(gomega.HaveOccurred())
klog.Infof(fmt.Sprintf("ResourceBinding(%s/%s)'s replicas is %d, expected: %d.",
resourceBinding.Namespace, resourceBinding.Name, resourceBinding.Spec.Replicas, expectedReplicas))
klog.Infof("ResourceBinding(%s/%s)'s replicas is %d, expected: %d.",
resourceBinding.Namespace, resourceBinding.Name, resourceBinding.Spec.Replicas, expectedReplicas)
return resourceBinding.Spec.Replicas, nil
}, pollTimeout, pollInterval).Should(gomega.Equal(expectedReplicas))
})
@ -350,14 +349,14 @@ var _ = framework.SerialDescribe("Resource interpreter customization testing", f
resourceBinding, err := karmadaClient.WorkV1alpha2().ResourceBindings(deployment.Namespace).Get(context.TODO(), resourceBindingName, metav1.GetOptions{})
g.Expect(err).NotTo(gomega.HaveOccurred())
klog.Infof(fmt.Sprintf("ResourceBinding(%s/%s)'s replicas is %d, expected: %d.",
resourceBinding.Namespace, resourceBinding.Name, resourceBinding.Spec.Replicas, expectedReplicas))
klog.Infof("ResourceBinding(%s/%s)'s replicas is %d, expected: %d.",
resourceBinding.Namespace, resourceBinding.Name, resourceBinding.Spec.Replicas, expectedReplicas)
if resourceBinding.Spec.Replicas != expectedReplicas {
return false, nil
}
klog.Infof(fmt.Sprintf("ResourceBinding(%s/%s)'s replicaRequirements is %+v, expected: %+v.",
resourceBinding.Namespace, resourceBinding.Name, resourceBinding.Spec.ReplicaRequirements, expectedReplicaRequirements))
klog.Infof("ResourceBinding(%s/%s)'s replicaRequirements is %+v, expected: %+v.",
resourceBinding.Namespace, resourceBinding.Name, resourceBinding.Spec.ReplicaRequirements, expectedReplicaRequirements)
return reflect.DeepEqual(resourceBinding.Spec.ReplicaRequirements, expectedReplicaRequirements), nil
}, pollTimeout, pollInterval).Should(gomega.Equal(true))
})

28
test/e2e/scheduling_test.go
View File

@ -397,8 +397,8 @@ var _ = ginkgo.Describe("[ReplicaScheduling] ReplicaSchedulingStrategy testing",
klog.Infof("check if deployment's replicas are duplicate on member clusters")
framework.WaitDeploymentPresentOnClustersFitWith(framework.ClusterNames(), deployment.Namespace, deployment.Name,
func(deploy *appsv1.Deployment) bool {
klog.Infof(fmt.Sprintf("Deployment(%s/%s)'s replcas is %d, expected: %d.",
deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, *deployment.Spec.Replicas))
klog.Infof("Deployment(%s/%s)'s replcas is %d, expected: %d.",
deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, *deployment.Spec.Replicas)
return *deploy.Spec.Replicas == *deployment.Spec.Replicas
})
})
@ -417,8 +417,8 @@ var _ = ginkgo.Describe("[ReplicaScheduling] ReplicaSchedulingStrategy testing",
klog.Infof("check if deployment's replicas have been updated on member clusters")
framework.WaitDeploymentPresentOnClustersFitWith(framework.ClusterNames(), deployment.Namespace, deployment.Name,
func(deploy *appsv1.Deployment) bool {
klog.Infof(fmt.Sprintf("Deployment(%s/%s)'s replcas is %d, expected: %d.",
deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, *deployment.Spec.Replicas))
klog.Infof("Deployment(%s/%s)'s replcas is %d, expected: %d.",
deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, *deployment.Spec.Replicas)
return *deploy.Spec.Replicas == *deployment.Spec.Replicas
})
})
@ -443,8 +443,8 @@ var _ = ginkgo.Describe("[ReplicaScheduling] ReplicaSchedulingStrategy testing",
klog.Infof("check if deployment's replicas are divided equally on member clusters")
framework.WaitDeploymentPresentOnClustersFitWith(framework.ClusterNames(), deployment.Namespace, deployment.Name,
func(deploy *appsv1.Deployment) bool {
klog.Infof(fmt.Sprintf("Deployment(%s/%s)'s replcas is %d, expected: %d.",
deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, expectedReplicas))
klog.Infof("Deployment(%s/%s)'s replcas is %d, expected: %d.",
deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, expectedReplicas)
return *deploy.Spec.Replicas == expectedReplicas
})
})
@ -474,8 +474,8 @@ var _ = ginkgo.Describe("[ReplicaScheduling] ReplicaSchedulingStrategy testing",
klog.Infof("check if deployment's replicas are divided equally on member clusters")
framework.WaitDeploymentPresentOnClustersFitWith(framework.ClusterNames(), deployment.Namespace, deployment.Name,
func(deploy *appsv1.Deployment) bool {
klog.Infof(fmt.Sprintf("Deployment(%s/%s)'s replcas is %d, expected: %d.",
deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, expectedReplicas))
klog.Infof("Deployment(%s/%s)'s replcas is %d, expected: %d.",
deploy.Namespace, deploy.Name, *deploy.Spec.Replicas, expectedReplicas)
return *deploy.Spec.Replicas == expectedReplicas
})
})
@ -523,8 +523,8 @@ var _ = ginkgo.Describe("[ReplicaScheduling] ReplicaSchedulingStrategy testing",
memberDeployment, err := clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{})
g.Expect(err).NotTo(gomega.HaveOccurred())
klog.Infof(fmt.Sprintf("Deployment(%s/%s)'s replcas is %d on cluster(%s), expected: %d.",
deploymentNamespace, deploymentName, *memberDeployment.Spec.Replicas, cluster.Name, expectedReplicas))
klog.Infof("Deployment(%s/%s)'s replcas is %d on cluster(%s), expected: %d.",
deploymentNamespace, deploymentName, *memberDeployment.Spec.Replicas, cluster.Name, expectedReplicas)
return *memberDeployment.Spec.Replicas, nil
}, pollTimeout, pollInterval).Should(gomega.Equal(expectedReplicas))
}
@ -582,8 +582,8 @@ var _ = ginkgo.Describe("[ReplicaScheduling] ReplicaSchedulingStrategy testing",
memberDeployment, err := clusterClient.AppsV1().Deployments(deploymentNamespace).Get(context.TODO(), deploymentName, metav1.GetOptions{})
g.Expect(err).NotTo(gomega.HaveOccurred())
klog.Infof(fmt.Sprintf("Deployment(%s/%s)'s replcas is %d on cluster(%s), expected: %d.",
deploymentNamespace, deploymentName, *memberDeployment.Spec.Replicas, cluster.Name, expectedReplicas))
klog.Infof("Deployment(%s/%s)'s replcas is %d on cluster(%s), expected: %d.",
deploymentNamespace, deploymentName, *memberDeployment.Spec.Replicas, cluster.Name, expectedReplicas)
return *memberDeployment.Spec.Replicas, nil
}, pollTimeout, pollInterval).Should(gomega.Equal(expectedReplicas))
}
@ -666,8 +666,8 @@ var _ = ginkgo.Describe("[JobReplicaScheduling] JobReplicaSchedulingStrategy tes
memberJob, err := clusterClient.BatchV1().Jobs(jobNamespace).Get(context.TODO(), jobName, metav1.GetOptions{})
g.Expect(err).NotTo(gomega.HaveOccurred())
klog.Infof(fmt.Sprintf("Job(%s/%s)'s parallelism is %d on cluster(%s), expected: %d.",
jobNamespace, jobName, *memberJob.Spec.Parallelism, cluster.Name, expectedReplicas))
klog.Infof("Job(%s/%s)'s parallelism is %d on cluster(%s), expected: %d.",
jobNamespace, jobName, *memberJob.Spec.Parallelism, cluster.Name, expectedReplicas)
return *memberJob.Spec.Parallelism, nil
}, pollTimeout, pollInterval).Should(gomega.Equal(expectedReplicas))
}