github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #75871 from SataQiu/fix-test-golint-20190329

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

2
test/e2e/framework/providers/gce/gce.go
View File

@ -58,7 +58,7 @@ func factory() (framework.ProviderInterface, error) {
} }
gceCloud, err := gcecloud.CreateGCECloud(&gcecloud.CloudConfig{ gceCloud, err := gcecloud.CreateGCECloud(&gcecloud.CloudConfig{
APIEndpoint: framework.TestContext.CloudConfig.ApiEndpoint, APIEndpoint: framework.TestContext.CloudConfig.APIEndpoint,
ProjectID: framework.TestContext.CloudConfig.ProjectID, ProjectID: framework.TestContext.CloudConfig.ProjectID,
Region: region, Region: region,
Zone: zone, Zone: zone,

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

@ -203,8 +203,9 @@ type NodeTestContextType struct {
ExtraEnvs map[string]string ExtraEnvs map[string]string
} }
// CloudConfig holds the cloud configuration for e2e test suites.
type CloudConfig struct { type CloudConfig struct {
ApiEndpoint string APIEndpoint string
ProjectID string ProjectID string
Zone string // for multizone tests, arbitrarily chosen zone Zone string // for multizone tests, arbitrarily chosen zone
Region string Region string
@ -224,9 +225,10 @@ type CloudConfig struct {
Provider ProviderInterface Provider ProviderInterface
} }
// TestContext should be used by all tests to access common context data.
var TestContext TestContextType var TestContext TestContextType
// Register flags common to all e2e test suites. // RegisterCommonFlags registers flags common to all e2e test suites.
func RegisterCommonFlags() { func RegisterCommonFlags() {
// Turn on verbose by default to get spec names // Turn on verbose by default to get spec names
config.DefaultReporterConfig.Verbose = true config.DefaultReporterConfig.Verbose = true
@ -269,7 +271,7 @@ func RegisterCommonFlags() {
flag.BoolVar(&TestContext.ListImages, "list-images", false, "If true, will show list of images used for runnning tests.") flag.BoolVar(&TestContext.ListImages, "list-images", false, "If true, will show list of images used for runnning tests.")
} }
// Register flags specific to the cluster e2e test suite. // RegisterClusterFlags registers flags specific to the cluster e2e test suite.
func RegisterClusterFlags() { func RegisterClusterFlags() {
flag.BoolVar(&TestContext.VerifyServiceAccount, "e2e-verify-service-account", true, "If true tests will verify the service account before running.") flag.BoolVar(&TestContext.VerifyServiceAccount, "e2e-verify-service-account", true, "If true tests will verify the service account before running.")
flag.StringVar(&TestContext.KubeConfig, clientcmd.RecommendedConfigPathFlag, os.Getenv(clientcmd.RecommendedConfigPathEnvVar), "Path to kubeconfig containing embedded authinfo.") flag.StringVar(&TestContext.KubeConfig, clientcmd.RecommendedConfigPathFlag, os.Getenv(clientcmd.RecommendedConfigPathEnvVar), "Path to kubeconfig containing embedded authinfo.")
@ -293,7 +295,7 @@ func RegisterClusterFlags() {
// TODO: Flags per provider? Rename gce-project/gce-zone? // TODO: Flags per provider? Rename gce-project/gce-zone?
cloudConfig := &TestContext.CloudConfig cloudConfig := &TestContext.CloudConfig
flag.StringVar(&cloudConfig.MasterName, "kube-master", "", "Name of the kubernetes master. Only required if provider is gce or gke") flag.StringVar(&cloudConfig.MasterName, "kube-master", "", "Name of the kubernetes master. Only required if provider is gce or gke")
flag.StringVar(&cloudConfig.ApiEndpoint, "gce-api-endpoint", "", "The GCE APIEndpoint being used, if applicable") flag.StringVar(&cloudConfig.APIEndpoint, "gce-api-endpoint", "", "The GCE APIEndpoint being used, if applicable")
flag.StringVar(&cloudConfig.ProjectID, "gce-project", "", "The GCE project being used, if applicable") flag.StringVar(&cloudConfig.ProjectID, "gce-project", "", "The GCE project being used, if applicable")
flag.StringVar(&cloudConfig.Zone, "gce-zone", "", "GCE zone being used, if applicable") flag.StringVar(&cloudConfig.Zone, "gce-zone", "", "GCE zone being used, if applicable")
flag.StringVar(&cloudConfig.Region, "gce-region", "", "GCE region being used, if applicable") flag.StringVar(&cloudConfig.Region, "gce-region", "", "GCE region being used, if applicable")
@ -326,7 +328,7 @@ func RegisterClusterFlags() {
flag.DurationVar(&nodeKiller.SimulatedDowntime, "node-killer-simulated-downtime", 10*time.Minute, "A delay between node death and recreation") flag.DurationVar(&nodeKiller.SimulatedDowntime, "node-killer-simulated-downtime", 10*time.Minute, "A delay between node death and recreation")
} }
// Register flags specific to the node e2e test suite. // RegisterNodeFlags registers flags specific to the node e2e test suite.
func RegisterNodeFlags() { func RegisterNodeFlags() {
// Mark the test as node e2e when node flags are api.Registry. // Mark the test as node e2e when node flags are api.Registry.
TestContext.NodeE2E = true TestContext.NodeE2E = true