Still try to cleanup service in TestSingleSvc on Windows.

Author: mitchell-as

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

@@ -157,9 +157,13 @@ 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.
+	// TODO: CP-1268 should remove this conditional and just keep the defer.
 	if runtime.GOOS != "windows" || !condition.OnCI() {
 		defer ts.Close()
+	} else {
+		defer func() {
+			ts.SpawnCmd(ts.SvcExe, "stop") // try to stop, but do not assert success
+		}()
 	}
 
 	ts.SpawnCmdWithOpts(ts.SvcExe, e2e.OptArgs("stop"))