-
Notifications
You must be signed in to change notification settings - Fork 38.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove fail argument from ReadOrDie() #81393
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,6 +33,8 @@ import ( | |
"path/filepath" | ||
"sort" | ||
"strings" | ||
|
||
"github.com/onsi/ginkgo" | ||
) | ||
|
||
var filesources []FileSource | ||
|
@@ -64,20 +66,14 @@ type FileSource interface { | |
DescribeFiles() string | ||
} | ||
|
||
// Fail is an error handler function with the same prototype and | ||
// semantic as ginkgo.Fail. Typically ginkgo.Fail is what callers | ||
// of ReadOrDie and Exists will pass. This way this package | ||
// avoids depending on Ginkgo. | ||
type Fail func(failure string, callerSkip ...int) | ||
|
||
// ReadOrDie tries to retrieve the desired file content from | ||
// one of the registered file sources. In contrast to FileSource, it | ||
// will either return a valid slice or abort the test by calling the fatal function, | ||
// i.e. the caller doesn't have to implement error checking. | ||
func ReadOrDie(filePath string, fail Fail) []byte { | ||
func ReadOrDie(filePath string) []byte { | ||
data, err := Read(filePath) | ||
if err != nil { | ||
fail(err.Error(), 1) | ||
ginkgo.Fail(err.Error(), 1) | ||
} | ||
return data | ||
} | ||
|
@@ -110,11 +106,11 @@ func Read(filePath string) ([]byte, error) { | |
// Exists checks whether a file could be read. Unexpected errors | ||
// are handled by calling the fail function, which then should | ||
// abort the current test. | ||
func Exists(filePath string, fail Fail) bool { | ||
func Exists(filePath string) bool { | ||
for _, filesource := range filesources { | ||
data, err := filesource.ReadTestFile(filePath) | ||
if err != nil { | ||
fail(fmt.Sprintf("fatal error looking for test file %s: %s", filePath, err), 1) | ||
ginkgo.Fail(fmt.Sprintf("fatal error looking for test file %s: %s", filePath, err), 1) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. here too |
||
} | ||
if data != nil { | ||
return true | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We may want to consider use e2elog.Fail instead if #80253 merges