github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 21:12:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #76251 from SataQiu/fix-golint-framework-20190408

Browse Source 
Fix golint failures of test/e2e/framework/framework.go
This commit is contained in:
Kubernetes Prow Robot 2019-04-08 14:41:10 -07:00 committed by GitHub
commit 30bd57293f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/framework/framework.go
View File

@ -105,7 +105,7 @@ type Framework struct {
cleanupHandle CleanupActionHandle
// configuration for framework's client
Options FrameworkOptions
Options Options
// Place where various additional data is stored during test run to be printed to ReportDir,
// or stdout if ReportDir is not set once test ends.
@ -122,8 +122,8 @@ type TestDataSummary interface {
PrintJSON() string
}
// FrameworkOptions is a struct for managing test framework options.
type FrameworkOptions struct {
// Options is a struct for managing test framework options.
type Options struct {
ClientQPS float32
ClientBurst int
GroupVersion *schema.GroupVersion
@ -132,7 +132,7 @@ type FrameworkOptions struct {
// NewDefaultFramework makes a new framework and sets up a BeforeEach/AfterEach for
// you (you can write additional before/after each functions).
func NewDefaultFramework(baseName string) *Framework {
options := FrameworkOptions{
options := Options{
ClientQPS: 20,
ClientBurst: 50,
}
@ -140,7 +140,7 @@ func NewDefaultFramework(baseName string) *Framework {
}
// NewFramework creates a test framework.
func NewFramework(baseName string, options FrameworkOptions, client clientset.Interface) *Framework {
func NewFramework(baseName string, options Options, client clientset.Interface) *Framework {
f := &Framework{
BaseName: baseName,
AddonResourceConstraints: make(map[string]ResourceConstraint),
@ -667,7 +667,7 @@ func kubectlExecWithRetry(namespace string, podName, containerName string, args
return stdOutBytes, stdErrBytes, err
}
err := fmt.Errorf("Failed: kubectl exec failed %d times with \"i/o timeout\". Giving up.", maxKubectlExecRetries)
err := fmt.Errorf("Failed: kubectl exec failed %d times with \"i/o timeout\". Giving up", maxKubectlExecRetries)
return nil, nil, err
}

2
test/e2e/network/proxy.go
View File

@ -54,7 +54,7 @@ const (
var _ = SIGDescribe("Proxy", func() {
version := "v1"
Context("version "+version, func() {
options := framework.FrameworkOptions{
options := framework.Options{
ClientQPS: -1.0,
}
f := framework.NewFramework("proxy", options, nil)

2
test/e2e/scalability/density.go
View File

@ -475,7 +475,7 @@ var _ = SIGDescribe("Density", func() {
Expect(missingMeasurements <= MaxMissingPodStartupMeasurements).To(Equal(true))
})
options := framework.FrameworkOptions{
options := framework.Options{
ClientQPS: 50.0,
ClientBurst: 100,
}

2
test/e2e/scalability/load.go
View File

@ -133,7 +133,7 @@ var _ = SIGDescribe("Load capacity", func() {
// Explicitly put here, to delete namespace at the end of the test
// (after measuring latency metrics, etc.).
options := framework.FrameworkOptions{
options := framework.Options{
ClientQPS: float32(math.Max(50.0, float64(2*throughput))),
ClientBurst: int(math.Max(100.0, float64(4*throughput))),
}