Unverified Commit 5fa0f561 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #64629 from Random-Liu/automated-cherry-pick-of-#62753-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #62753: Fix extra-log flag for node e2e. Cherry pick of #62753 on release-1.10. #62753: Fix extra-log flag for node e2e.
parents d8f9e51c 560f0e22
...@@ -44,12 +44,6 @@ func (l *logFiles) String() string { ...@@ -44,12 +44,6 @@ func (l *logFiles) String() string {
// Set function of flag.Value // Set function of flag.Value
func (l *logFiles) Set(value string) error { func (l *logFiles) Set(value string) error {
// Someone else is calling flag.Parse after the flags are parsed in the
// test framework. Use this to avoid the flag being parsed twice.
// TODO(random-liu): Figure out who is parsing the flags.
if flag.Parsed() {
return nil
}
var log LogFileData var log LogFileData
if err := json.Unmarshal([]byte(value), &log); err != nil { if err := json.Unmarshal([]byte(value), &log); err != nil {
return err return err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment