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

Rely only on source cli parameter in conformance/walk

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas
2024-03-01 21:58:54 -05:00
parent f4b01154ef
commit 948d9ca221
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/conformance/walk.go
View File

@@ -179,21 +179,12 @@ func saveAllTestInfo(dataSet []*ConformanceData) {
} }
func getConformanceData(targetFrame frame) (*ConformanceData, error) { func getConformanceData(targetFrame frame) (*ConformanceData, error) {
// TODO: This is terribly hacky. Why can't we rely on the --source flag in
// all cases? https://issues.k8s.io/123567
//
// Filenames may be in a couple special places, depending on if they were
// built dockerized or with the host go. We want to trim this prefix to
// produce portable relative paths.
containerGopath := "/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/"
root := *k8sPath root := *k8sPath
if !strings.HasSuffix(root, string(os.PathSeparator)) { if !strings.HasSuffix(root, string(os.PathSeparator)) {
root += string(os.PathSeparator) root += string(os.PathSeparator)
} }
trimmedFile := strings.TrimPrefix(targetFrame.File, root) trimmedFile := strings.TrimPrefix(targetFrame.File, root)
trimmedFile = strings.TrimPrefix(trimmedFile, containerGopath)
targetFrame.File = trimmedFile targetFrame.File = trimmedFile
freader, err := os.Open(targetFrame.File) freader, err := os.Open(targetFrame.File)