Merge pull request #3786 from ActiveState/mitchell/cp-1129-2

Avoid state-svc TestSingleSvc integration test timeouts on Windows.

Author: mitchell-as

cmd/state-svc/main.go

@@ -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)
 	}()

cmd/state-svc/test/integration/svc_int_test.go

@@ -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