Merge pull request #215 from DataDog/anmarchenko/bail_out_of_tracing_…

…when_job_canceled

[SDTEST-666] RSpec - don't report test errors if rspec process is quitting

lib/datadog/ci/contrib/rspec/example.rb

@@ -62,7 +62,12 @@ def run(*args)
                   # before each run remove any previous exception
                   @exception = nil
 
-                  super
+                  result = super
+
+                  # In case when test job is canceled and RSpec is quitting we don't want to report the last test
+                  # before RSpec context unwinds. This test might have some unrelated errors that we don't want to
+                  # report.
+                  return result if ::RSpec.world.wants_to_quit
 
                   case execution_result.status
                   when :passed

spec/datadog/ci/contrib/rspec/instrumentation_spec.rb

@@ -32,6 +32,7 @@ def rspec_session_run(
     with_shared_test: false,
     with_shared_context: false,
     with_flaky_test: false,
+    with_canceled_test: false,
     unskippable: {
       test: false,
       context: false,
@@ -85,6 +86,14 @@ def rspec_session_run(
               end
             end
           end
+
+          if with_canceled_test
+            it "canceled during execution" do
+              RSpec.world.wants_to_quit = true
+
+              expect(1 + 1).to eq(34)
+            end
+          end
         end
       end
 
@@ -138,7 +147,7 @@ def rspec_session_run(
         :source_file,
         "spec/datadog/ci/contrib/rspec/instrumentation_spec.rb"
       )
-      expect(first_test_span).to have_test_tag(:source_start, "111")
+      expect(first_test_span).to have_test_tag(:source_start, "120")
       expect(first_test_span).to have_test_tag(
         :codeowners,
         "[\"@DataDog/ruby-guild\", \"@DataDog/ci-app-libraries\"]"
@@ -932,4 +941,21 @@ def rspec_skipped_session_run
       expect(test_session_span).to have_fail_status
     end
   end
+
+  context "session that is canceled during the test execution" do
+    include_context "CI mode activated" do
+      let(:integration_name) { :rspec }
+      let(:integration_options) { {service_name: "lspec"} }
+    end
+
+    it "retries test until it passes" do
+      rspec_session_run(with_canceled_test: true)
+
+      expect(test_spans).to have(2).items
+      test_spans.each do |test_span|
+        expect(test_span).not_to have_test_tag(:status, "fail")
+        expect(test_span.status).to eq(0)
+      end
+    end
+  end
 end

vendor/rbs/rspec/0/rspec.rbs

@@ -1,5 +1,6 @@
 module RSpec
   def self.configuration: () -> RSpec::Core::Configuration
+  def self.world: () -> RSpec::Core::World
 end
 
 module RSpec::Core
@@ -46,3 +47,7 @@ end
 class RSpec::Core::Configuration
   def dry_run?: () -> bool
 end
+
+class RSpec::Core::World
+  def wants_to_quit: () -> bool
+end