github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #123636 from dims/rely-only-on-source-cli-parameter-in-conformance-walk

Browse Source 
Rely only on `source` cli parameter in conformance/walk
This commit is contained in:
Kubernetes Prow Robot 2024-03-02 07:44:20 -08:00 committed by GitHub
commit 61410237c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 9 deletions
Show Stats 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) {
// 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
if !strings.HasSuffix(root, string(os.PathSeparator)) {
root += string(os.PathSeparator)
}
trimmedFile := strings.TrimPrefix(targetFrame.File, root)
trimmedFile = strings.TrimPrefix(trimmedFile, containerGopath)
targetFrame.File = trimmedFile
freader, err := os.Open(targetFrame.File)