github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

e2e/framework: absolute test file paths

Browse Source 
Tests might want to use there own options for specifying a file path,
while still using the abstract file access API. For example,
framework.CreateFromManifests might be used to create a mixture of
files under the repo root and from elsewhere. To support this,
absolute paths can now be given to the testfiles package and they will
be read directly.
This commit is contained in:
Patrick Ohly 2018-12-03 18:57:11 +01:00
parent dc9261bc3b
commit 1103477335
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/framework/testfiles/testfiles.go
View File

@ -129,9 +129,16 @@ type RootFileSource struct {
} }
// ReadTestFile looks for the file relative to the configured // ReadTestFile looks for the file relative to the configured
// root directory. // root directory. If the path is already absolute, for example
// in a test that has its own method of determining where
// files are, then the path will be used directly.
func (r RootFileSource) ReadTestFile(filePath string) ([]byte, error) { func (r RootFileSource) ReadTestFile(filePath string) ([]byte, error) {
fullPath := filepath.Join(r.Root, filePath) var fullPath string
if path.IsAbs(filePath) {
fullPath = filePath
} else {
fullPath = filepath.Join(r.Root, filePath)
}
data, err := ioutil.ReadFile(fullPath) data, err := ioutil.ReadFile(fullPath)
if os.IsNotExist(err) { if os.IsNotExist(err) {
// Not an error (yet), some other provider may have the file. // Not an error (yet), some other provider may have the file.