Merge pull request #1350 from DataDog/ivoanjo/fix-potential-flaky-test

Fix potential flaky test
DataDog · Feb 5, 2021 · 9ee8fc7 · 9ee8fc7
2 parents a4aadec + 89fabc8
commit 9ee8fc7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/spec/ddtrace/transport/http/adapters/net_integration_spec.rb b/spec/ddtrace/transport/http/adapters/net_integration_spec.rb
@@ -39,11 +39,14 @@
 
     before do
       server.mount_proc('/', &server_proc)
-      Thread.new { server.start }
+      @server_thread = Thread.new { server.start }
       init_signal.pop
     end
 
-    after { server.shutdown }
+    after do
+      server.shutdown
+      @server_thread.join
+    end
   end
 
   describe 'when sending traces through Net::HTTP adapter' do