github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #71667 from pohly/testfiles-absolute

Browse Source 
e2e/framework: absolute test file paths
This commit is contained in:
Kubernetes Prow Robot 2019-01-10 14:42:19 -08:00 committed by GitHub
commit 0f50fdc58d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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.