Skip to content

Still try to cleanup service in TestSingleSvc on Windows. #3795

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.

Sign up for GitHub

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

Draft
mitchell-as wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Still try to cleanup service in TestSingleSvc on Windows. #3795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f8d1f5
Still try to cleanup service in TestSingleSvc on Windows.
mitchell-as Dec 23, 2025
ed8a287
Disable svc warning.
mitchell-as Dec 23, 2025
023b8de
Test
mitchell-as Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/state-svc/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func main() {
}

if err := events.WaitForEvents(5*time.Second, rollbar.Wait, authentication.LegacyClose, logging.Close); err != nil {
fmt.Fprintf(os.Stderr, "Warning: failed to wait for events")
//fmt.Fprintf(os.Stderr, "Warning: failed to wait for events")
}
os.Exit(exitCode)
}()
Expand Down
10 changes: 8 additions & 2 deletions cmd/state-svc/test/integration/svc_int_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,15 @@ func (suite *SvcIntegrationTestSuite) TestStartDuplicateErrorOutput() {
func (suite *SvcIntegrationTestSuite) TestSingleSvc() {
suite.OnlyRunForTags(tagsuite.Service)
ts := e2e.New(suite.T(), false)
// TODO: CP-1268 should remove this conditional.
if runtime.GOOS != "windows" || !condition.OnCI() {
// TODO: CP-1268 should remove this conditional and just keep the defer.
//if runtime.GOOS != "windows" || !condition.OnCI() {
defer ts.Close()
//} else {
// defer func() {
// cp := ts.SpawnCmd(ts.SvcExe, "stop")
// time.Sleep(500 * time.Millisecond)
// cp.SendCtrlC() // if this ends up as a foreground process, then try to halt it
// }()
}

ts.SpawnCmdWithOpts(ts.SvcExe, e2e.OptArgs("stop"))
Expand Down
Loading