github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add public functions to define CSI external tests

Browse Source 
3rd party test suites that want to include external CSI tests may not use
"flags" for cmdline parsing.
This commit is contained in:
Jan Safranek
2019-07-02 12:01:55 +02:00
parent a807cb625b
commit 2a08bd64af
2 changed files with 10 additions and 3 deletions
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 {
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 {
return err
}
@@ -84,7 +91,7 @@ func (t testDriverParameter) Set(filename string) error {
return nil
}
func (t testDriverParameter) loadDriverDefinition(filename string) (*driverDefinition, error) {
func loadDriverDefinition(filename string) (*driverDefinition, error) {
if filename == "" {
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 {
actual, err := testDriverParameter{}.loadDriverDefinition(testcase.filename)
actual, err := loadDriverDefinition(testcase.filename)
if testcase.err == "" {
assert.NoError(t, err, testcase.name)
} else {