Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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 {
logging.Warning("Failing to wait events")
fmt.Fprintf(os.Stderr, "Warning: failed to wait for events")
}
os.Exit(exitCode)
}()
Expand Down
5 changes: 4 additions & 1 deletion cmd/state-svc/test/integration/svc_int_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,10 @@ func (suite *SvcIntegrationTestSuite) TestStartDuplicateErrorOutput() {
func (suite *SvcIntegrationTestSuite) TestSingleSvc() {
suite.OnlyRunForTags(tagsuite.Service)
ts := e2e.New(suite.T(), false)
defer ts.Close()
// TODO: CP-1268 should remove this conditional.
if runtime.GOOS != "windows" || !condition.OnCI() {
defer ts.Close()
}

ts.SpawnCmdWithOpts(ts.SvcExe, e2e.OptArgs("stop"))
time.Sleep(2 * time.Second) // allow for some time to stop the existing available process
Expand Down
Loading