-
-
Notifications
You must be signed in to change notification settings - Fork 828
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
Add exiter to test os.Exit case #729
Merged
+109
−4
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1044,7 +1044,7 @@ include_file = ["main.sh"] | |
|
||
t.Logf("start change main.sh") | ||
go func() { | ||
err := os.WriteFile("main.sh", []byte("#!/bin/sh\nprintf modified > output"), 0o755) | ||
err = os.WriteFile("main.sh", []byte("#!/bin/sh\nprintf modified > output"), 0o755) | ||
if err != nil { | ||
log.Fatalf("Error updating file: %s.", err) | ||
} | ||
|
@@ -1058,3 +1058,86 @@ include_file = ["main.sh"] | |
} | ||
assert.Equal(t, []byte("modified"), bytes) | ||
} | ||
|
||
type testExiter struct { | ||
t *testing.T | ||
called bool | ||
expectCode int | ||
} | ||
|
||
func (te *testExiter) Exit(code int) { | ||
te.called = true | ||
if code != te.expectCode { | ||
te.t.Fatalf("expected exit code %d, got %d", te.expectCode, code) | ||
} | ||
} | ||
|
||
func TestEngineExit(t *testing.T) { | ||
tests := []struct { | ||
name string | ||
setup func(*Engine, chan<- int) | ||
expectCode int | ||
wantCalled bool | ||
}{ | ||
{ | ||
name: "normal exit - no error", | ||
setup: func(_ *Engine, exitCode chan<- int) { | ||
go func() { | ||
exitCode <- 0 | ||
}() | ||
}, | ||
expectCode: 0, | ||
wantCalled: false, | ||
}, | ||
{ | ||
name: "error exit - non-zero code", | ||
setup: func(_ *Engine, exitCode chan<- int) { | ||
go func() { | ||
exitCode <- 1 | ||
}() | ||
}, | ||
expectCode: 1, | ||
wantCalled: true, | ||
}, | ||
{ | ||
name: "process timeout", | ||
setup: func(_ *Engine, _ chan<- int) { | ||
}, | ||
Comment on lines
+1104
to
+1105
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. Maybe adding a time.Sleep here would make it clearer to anyone reading this |
||
expectCode: 0, | ||
wantCalled: false, | ||
}, | ||
} | ||
|
||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
e, err := NewEngine("", true) | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
exiter := &testExiter{ | ||
t: t, | ||
expectCode: tt.expectCode, | ||
} | ||
e.exiter = exiter | ||
|
||
exitCode := make(chan int) | ||
|
||
if tt.setup != nil { | ||
tt.setup(e, exitCode) | ||
} | ||
select { | ||
case ret := <-exitCode: | ||
if ret != 0 { | ||
e.exiter.Exit(ret) | ||
} | ||
case <-time.After(1 * time.Millisecond): | ||
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. 10 ms could avoid flakiness on some strange use case |
||
// timeout case | ||
} | ||
|
||
if tt.wantCalled != exiter.called { | ||
t.Errorf("Exit() called = %v, want %v", exiter.called, tt.wantCalled) | ||
} | ||
}) | ||
} | ||
} |
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 |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package runner | ||
|
||
import "os" | ||
|
||
type exiter interface { | ||
Exit(code int) | ||
} | ||
|
||
type defaultExiter struct{} | ||
|
||
func (d defaultExiter) Exit(code int) { | ||
os.Exit(code) | ||
} |
Oops, something went wrong.
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.
I'm unsure I get it
You ate no longer calling stopBin, so here you are testing the test exiter behavior?
I mean I don't get you are calling the exiter itself in this method
🤔
Did I miss something?
You had the call to stopBin earlier, no?