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

Merge pull request #79088 from s-ito-ts/golint_e2e_storage_testsuites

Browse Source 
Fix golint failures of test/e2e/storage/testsuites
This commit is contained in:
Kubernetes Prow Robot 2019-06-19 18:37:25 -07:00 committed by GitHub
commit 96a2f12b4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.golint_failures
View File

@ -571,7 +571,6 @@ staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/flunder
test/e2e/common test/e2e/common
test/e2e/lifecycle/bootstrap test/e2e/lifecycle/bootstrap
test/e2e/scalability test/e2e/scalability
test/e2e/storage/testsuites
test/e2e/storage/vsphere test/e2e/storage/vsphere
test/e2e_kubeadm test/e2e_kubeadm
test/e2e_node test/e2e_node

5
test/e2e/storage/testsuites/base.go
View File

@ -574,15 +574,14 @@ func getMigrationVolumeOpCounts(cs clientset.Interface, pluginName string) (opCo
migratedOps = getVolumeOpCounts(cs, csiName) migratedOps = getVolumeOpCounts(cs, csiName)
} }
return getVolumeOpCounts(cs, pluginName), migratedOps return getVolumeOpCounts(cs, pluginName), migratedOps
} else { }
// Not an in-tree driver // Not an in-tree driver
e2elog.Logf("Test running for native CSI Driver, not checking metrics") e2elog.Logf("Test running for native CSI Driver, not checking metrics")
return opCounts{}, opCounts{} return opCounts{}, opCounts{}
}
} }
func getTotOps(ops opCounts) int64 { func getTotOps(ops opCounts) int64 {
var tot int64 = 0 var tot = int64(0)
for _, count := range ops { for _, count := range ops {
tot += count tot += count
} }

2
test/e2e/storage/testsuites/provisioning.go
View File

@ -439,6 +439,7 @@ func PVMultiNodeCheck(client clientset.Interface, claim *v1.PersistentVolumeClai
pod = nil pod = nil
} }
// TestBindingWaitForFirstConsumer tests the binding with WaitForFirstConsumer mode
func (t StorageClassTest) TestBindingWaitForFirstConsumer(nodeSelector map[string]string, expectUnschedulable bool) (*v1.PersistentVolume, *v1.Node) { func (t StorageClassTest) TestBindingWaitForFirstConsumer(nodeSelector map[string]string, expectUnschedulable bool) (*v1.PersistentVolume, *v1.Node) {
pvs, node := t.TestBindingWaitForFirstConsumerMultiPVC([]*v1.PersistentVolumeClaim{t.Claim}, nodeSelector, expectUnschedulable) pvs, node := t.TestBindingWaitForFirstConsumerMultiPVC([]*v1.PersistentVolumeClaim{t.Claim}, nodeSelector, expectUnschedulable)
if pvs == nil { if pvs == nil {
@ -447,6 +448,7 @@ func (t StorageClassTest) TestBindingWaitForFirstConsumer(nodeSelector map[strin
return pvs[0], node return pvs[0], node
} }
// TestBindingWaitForFirstConsumerMultiPVC tests the binding with WaitForFirstConsumer mode
func (t StorageClassTest) TestBindingWaitForFirstConsumerMultiPVC(claims []*v1.PersistentVolumeClaim, nodeSelector map[string]string, expectUnschedulable bool) ([]*v1.PersistentVolume, *v1.Node) { func (t StorageClassTest) TestBindingWaitForFirstConsumerMultiPVC(claims []*v1.PersistentVolumeClaim, nodeSelector map[string]string, expectUnschedulable bool) ([]*v1.PersistentVolume, *v1.Node) {
var err error var err error
gomega.Expect(len(claims)).ToNot(gomega.Equal(0)) gomega.Expect(len(claims)).ToNot(gomega.Equal(0))

9
test/e2e/storage/testsuites/snapshottable.go
View File

@ -45,15 +45,6 @@ var (
snapshotContentGVR = schema.GroupVersionResource{Group: snapshotGroup, Version: "v1alpha1", Resource: "volumesnapshotcontents"} snapshotContentGVR = schema.GroupVersionResource{Group: snapshotGroup, Version: "v1alpha1", Resource: "volumesnapshotcontents"}
) )
type SnapshotClassTest struct {
Name string
CloudProviders []string
Snapshotter string
Parameters map[string]string
NodeName string
NodeSelector map[string]string // NodeSelector for the pod
}
type snapshottableTestSuite struct { type snapshottableTestSuite struct {
tsInfo TestSuiteInfo tsInfo TestSuiteInfo
} }

1
test/e2e/storage/testsuites/testdriver.go
View File

@ -112,6 +112,7 @@ type SnapshottableTestDriver interface {
// Capability represents a feature that a volume plugin supports // Capability represents a feature that a volume plugin supports
type Capability string type Capability string
// Constants related to capability
const ( const (
CapPersistence Capability = "persistence" // data is persisted across pod restarts CapPersistence Capability = "persistence" // data is persisted across pod restarts
CapBlock Capability = "block" // raw block mode CapBlock Capability = "block" // raw block mode