mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Add public functions to define CSI external tests
3rd party test suites that want to include external CSI tests may not use "flags" for cmdline parsing.
This commit is contained in:
parent
a807cb625b
commit
2a08bd64af
11
test/e2e/storage/external/external.go
vendored
11
test/e2e/storage/external/external.go
vendored
@ -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
2
test/e2e/storage/external/external_test.go
vendored
@ -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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user