Skip to content

Commit

Permalink
Merge pull request #182 from DataDog/anmarchenko/improve_jruby_ci
Browse files Browse the repository at this point in the history
[NO-TICKET] reenable git specs for jruby and delete useless flaky spec
  • Loading branch information
anmarchenko authored May 24, 2024
2 parents 1c997fd + ca087ec commit 5e4cd99
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
13 changes: 0 additions & 13 deletions spec/datadog/ci/contrib/minitest/instrumentation_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -681,19 +681,6 @@ def test_b_2
expect(first_test_span).to have_test_tag(:test_session_id, test_session_span.id.to_s)
end

it "correctly tracks test and session durations" do
test_session_duration = test_session_span.duration

test_durations_sum = test_spans.map { |span| span.duration }.sum
# with parallel execution test durations sum should be greater than test session duration
expect(test_durations_sum).to be > test_session_duration

# each individual test duration should be less than test session duration
test_spans.each do |span|
expect(span.duration).to be < test_session_duration
end
end

it "creates test suite spans" do
expect(test_suite_spans).to have(4).items

Expand Down
2 changes: 0 additions & 2 deletions spec/datadog/ci/git/local_repository_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,6 @@ def with_custom_git_environment
end

context "with cloned repository" do
before { skip if PlatformHelpers.jruby? }

let(:commits_count) { 2 }

let(:tmpdir) { Dir.mktmpdir }
Expand Down

0 comments on commit 5e4cd99

Please sign in to comment.