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

Merge pull request #79647 from jsafrane/public-external-csi

Browse Source 
Add public functions to define CSI external tests
This commit is contained in:
Kubernetes Prow Robot 2019-07-02 07:01:09 -07:00 committed by GitHub
commit 6b5f5514a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/storage/external/external.go vendored
View File

@ -68,7 +68,14 @@ func (t testDriverParameter) String() string {
} }
func (t testDriverParameter) Set(filename string) error { func (t testDriverParameter) Set(filename string) error {
driver, err := t.loadDriverDefinition(filename) return AddDriverDefinition(filename)
}
// AddDriverDefinition defines ginkgo tests for CSI driver definition file.
// Either --storage.testdriver cmdline argument or AddDriverDefinition can be used
// to define the tests.
func AddDriverDefinition(filename string) error {
driver, err := loadDriverDefinition(filename)
if err != nil { if err != nil {
return err return err
} }
@ -84,7 +91,7 @@ func (t testDriverParameter) Set(filename string) error {
return nil return nil
} }
func (t testDriverParameter) loadDriverDefinition(filename string) (*driverDefinition, error) { func loadDriverDefinition(filename string) (*driverDefinition, error) {
if filename == "" { if filename == "" {
return nil, errors.New("missing file name") return nil, errors.New("missing file name")
} }

2
test/e2e/storage/external/external_test.go vendored
View File

@ -64,7 +64,7 @@ func TestDriverParameter(t *testing.T) {
} }
for _, testcase := range testcases { for _, testcase := range testcases {
actual, err := testDriverParameter{}.loadDriverDefinition(testcase.filename) actual, err := loadDriverDefinition(testcase.filename)
if testcase.err == "" { if testcase.err == "" {
assert.NoError(t, err, testcase.name) assert.NoError(t, err, testcase.name)
} else { } else {