Merge pull request #435 from YOU54F/fix/zombie_plugin_processes

fix: zombie plugin processes
pact-foundation · Jul 4, 2024 · cd75a5e · cd75a5e
2 parents 43d1bda + 4297634
commit cd75a5e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/consumer/http.go b/consumer/http.go
@@ -178,6 +178,7 @@ func (p *httpMockProvider) ExecuteTest(t *testing.T, integrationTest func(MockSe
 // Clear state between tests
 func (p *httpMockProvider) reset() {
 	p.mockserver.CleanupMockServer(p.config.Port)
+	p.mockserver.CleanupPlugins()
 	p.config.Port = 0
 	err := p.configure()
 	if err != nil {

diff --git a/internal/native/message_server_test.go b/internal/native/message_server_test.go
@@ -211,6 +211,7 @@ func TestGetPluginSyncMessageContentsAsBytes(t *testing.T) {
 	m := NewMessageServer("test-message-consumer", "test-message-provider")
 
 	// Protobuf plugin test
+	defer m.CleanupPlugins()
 	err := m.UsingPlugin("protobuf", "0.3.15")
 	assert.NoError(t, err)
 
@@ -268,6 +269,7 @@ func TestGetPluginSyncMessageContentsAsBytes_EmptyResponse(t *testing.T) {
 	m := NewMessageServer("test-message-consumer", "test-message-provider")
 
 	// Protobuf plugin test
+	defer m.CleanupPlugins()
 	err := m.UsingPlugin("protobuf", "0.3.15")
 	assert.NoError(t, err)
 
@@ -314,6 +316,7 @@ func TestGetPluginAsyncMessageContentsAsBytes(t *testing.T) {
 	m := NewMessageServer("test-message-consumer", "test-message-provider")
 
 	// Protobuf plugin test
+	defer m.CleanupPlugins()
 	_ = m.UsingPlugin("protobuf", "0.3.15")
 
 	i := m.NewAsyncMessageInteraction("grpc interaction")
@@ -354,6 +357,7 @@ func TestGrpcPluginInteraction(t *testing.T) {
 	m := NewMessageServer("test-message-consumer", "test-message-provider")
 
 	// Protobuf plugin test
+	defer m.CleanupPlugins()
 	_ = m.UsingPlugin("protobuf", "0.3.15")
 
 	i := m.NewSyncMessageInteraction("grpc interaction")
@@ -431,6 +435,7 @@ func TestGrpcPluginInteraction_ErrorResponse(t *testing.T) {
 	m := NewMessageServer("test-message-consumer", "test-message-provider")
 
 	// Protobuf plugin test
+	defer m.CleanupPlugins()
 	_ = m.UsingPlugin("protobuf", "0.3.15")
 
 	i := m.NewSyncMessageInteraction("grpc interaction")

diff --git a/internal/native/mock_server_test.go b/internal/native/mock_server_test.go
@@ -172,6 +172,7 @@ func TestPluginInteraction(t *testing.T) {
 	m := NewHTTPPact("test-plugin-consumer", "test-plugin-provider")
 
 	// Protobuf plugin test
+	defer m.CleanupPlugins()
 	_ = m.UsingPlugin("protobuf", "0.3.15")
 	m.WithSpecificationVersion(SPECIFICATION_VERSION_V4)
 

diff --git a/message/v4/asynchronous_message.go b/message/v4/asynchronous_message.go
@@ -94,6 +94,7 @@ type AsynchronousMessageWithPluginContents struct {
 }
 
 func (s *AsynchronousMessageWithPluginContents) ExecuteTest(t *testing.T, integrationTest func(m AsynchronousMessage) error) error {
+	defer s.rootBuilder.pact.messageserver.CleanupPlugins()
 	message, err := getAsynchronousMessageWithReifiedContents(s.rootBuilder.messageHandle, s.rootBuilder.Type)
 	if err != nil {
 		return err
@@ -106,8 +107,6 @@ func (s *AsynchronousMessageWithPluginContents) ExecuteTest(t *testing.T, integr
 		return err
 	}
 
-	s.rootBuilder.pact.messageserver.CleanupPlugins()
-
 	return s.rootBuilder.pact.messageserver.WritePactFile(s.rootBuilder.pact.config.PactDir, false)
 }
 
@@ -133,13 +132,13 @@ type AsynchronousMessageWithTransport struct {
 }
 
 func (s *AsynchronousMessageWithTransport) ExecuteTest(t *testing.T, integrationTest func(tc TransportConfig, m AsynchronousMessage) error) error {
+	defer s.rootBuilder.pact.messageserver.CleanupMockServer(s.transport.Port)
+	defer s.rootBuilder.pact.messageserver.CleanupPlugins()
 	message, err := getAsynchronousMessageWithReifiedContents(s.rootBuilder.messageHandle, s.rootBuilder.Type)
 	if err != nil {
 		return err
 	}
 
-	defer s.rootBuilder.pact.messageserver.CleanupMockServer(s.transport.Port)
-
 	err = integrationTest(s.transport, message)
 
 	if err != nil {

diff --git a/message/v4/synchronous_message.go b/message/v4/synchronous_message.go
@@ -208,6 +208,7 @@ type SynchronousMessageWithPluginContents struct {
 // Will cleanup interactions between tests within a suite
 // and write the pact file if successful
 func (m *SynchronousMessageWithPluginContents) ExecuteTest(t *testing.T, integrationTest func(m SynchronousMessage) error) error {
+	defer m.pact.mockserver.CleanupPlugins()
 	message, err := getSynchronousMessageWithContents(m.messageHandle)
 	if err != nil {
 		return err
@@ -246,13 +247,13 @@ type SynchronousMessageWithTransport struct {
 }
 
 func (s *SynchronousMessageWithTransport) ExecuteTest(t *testing.T, integrationTest func(tc TransportConfig, m SynchronousMessage) error) error {
+	defer s.pact.mockserver.CleanupMockServer(s.transport.Port)
+	defer s.pact.mockserver.CleanupPlugins()
 	message, err := getSynchronousMessageWithContents(s.messageHandle)
 	if err != nil {
 		return err
 	}
 
-	defer s.pact.mockserver.CleanupMockServer(s.transport.Port)
-
 	err = integrationTest(s.transport, message)
 
 	// matched := s.pact.mockserver.MockServerMatched(s.transport.Port)
@@ -267,8 +268,6 @@ func (s *SynchronousMessageWithTransport) ExecuteTest(t *testing.T, integrationT
 		return err
 	}
 
-	s.pact.mockserver.CleanupPlugins()
-
 	return s.pact.mockserver.WritePactFileForServer(s.transport.Port, s.pact.config.PactDir, false)
 }
 

diff --git a/provider/verify_request.go b/provider/verify_request.go
@@ -300,8 +300,8 @@ func (v *VerifyRequest) Verify(handle *native.Verifier, writer outputWriter) err
 		handle.SetProviderState(v.ProviderStatesSetupURL, true, true)
 	}
 
-	res := handle.Execute()
 	defer handle.Shutdown()
+	res := handle.Execute()
 
 	return res
 }