From e0b73a55b367771967f498884901acc10bd0cfc0 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 12 Feb 2025 14:26:29 -0500 Subject: [PATCH] Uncomment skips for sidekiq, crashtracking, and telemetry specs. --- .github/workflows/test.yml | 1 + spec/datadog/core/crashtracking/component_spec.rb | 4 ++-- spec/datadog/core/telemetry/component_spec.rb | 8 ++++---- .../sidekiq/server_internal_tracer/heartbeat_spec.rb | 2 +- .../sidekiq/server_internal_tracer/job_fetch_spec.rb | 2 +- .../sidekiq/server_internal_tracer/redis_info_spec.rb | 2 +- .../server_internal_tracer/scheduled_poller_spec.rb | 2 +- tasks/github.rake | 9 ++++++--- 8 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 655ab74532c..1a6fa1afe05 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,6 +6,7 @@ name: Unit Tests push: branches: - master + - sarahchen6/* pull_request: branches: - master diff --git a/spec/datadog/core/crashtracking/component_spec.rb b/spec/datadog/core/crashtracking/component_spec.rb index 7282741fe5e..63fb7031fb7 100644 --- a/spec/datadog/core/crashtracking/component_spec.rb +++ b/spec/datadog/core/crashtracking/component_spec.rb @@ -212,7 +212,7 @@ let(:agent_base_url) { "http://#{hostname}:#{port}" } [:fiddle, :signal].each do |trigger| - it "reports crashes via http when app crashes with #{trigger}", skip: ENV['BATCHED_TASKS'] do + it "reports crashes via http when app crashes with #{trigger}" do fork_expectations = proc do |status:, stdout:, stderr:| expect(Signal.signame(status.termsig)).to eq('SEGV').or eq('ABRT') expect(stderr).to include('[BUG] Segmentation fault') @@ -269,7 +269,7 @@ # Do nothing, it's ok end - it 'reports crashes via uds when app crashes with fiddle', skip: ENV['BATCHED_TASKS'] do + it 'reports crashes via uds when app crashes with fiddle' do fork_expectations = proc do |status:, stdout:, stderr:| expect(Signal.signame(status.termsig)).to eq('SEGV').or eq('ABRT') expect(stderr).to include('[BUG] Segmentation fault') diff --git a/spec/datadog/core/telemetry/component_spec.rb b/spec/datadog/core/telemetry/component_spec.rb index 7b1b7ca1708..02b02851de6 100644 --- a/spec/datadog/core/telemetry/component_spec.rb +++ b/spec/datadog/core/telemetry/component_spec.rb @@ -119,7 +119,7 @@ end end - context 'when in fork', skip: ENV['BATCHED_TASKS'] do + context 'when in fork' do before { skip 'Fork not supported on current platform' unless Process.respond_to?(:fork) } it do @@ -169,7 +169,7 @@ end end - context 'when in fork', skip: ENV['BATCHED_TASKS'] do + context 'when in fork' do before { skip 'Fork not supported on current platform' unless Process.respond_to?(:fork) } it do @@ -209,7 +209,7 @@ end end - context 'when in fork', skip: ENV['BATCHED_TASKS'] do + context 'when in fork' do before { skip 'Fork not supported on current platform' unless Process.respond_to?(:fork) } it do @@ -245,7 +245,7 @@ expect(worker).to have_received(:enqueue).with(event) end - context 'when in fork', skip: !Process.respond_to?(:fork) || ENV['BATCHED_TASKS'] do + context 'when in fork', skip: !Process.respond_to?(:fork) do it do telemetry expect_in_fork do diff --git a/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/heartbeat_spec.rb b/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/heartbeat_spec.rb index 9085f962551..201fb568f75 100644 --- a/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/heartbeat_spec.rb +++ b/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/heartbeat_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require_relative '../support/helper' -RSpec.describe 'Server internal tracer heartbeat', skip: ENV['BATCHED_TASKS'] do +RSpec.describe 'Server internal tracer heartbeat' do include SidekiqServerExpectations before do diff --git a/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/job_fetch_spec.rb b/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/job_fetch_spec.rb index 9f3a6ce2823..66c9fab5123 100644 --- a/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/job_fetch_spec.rb +++ b/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/job_fetch_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require_relative '../support/helper' -RSpec.describe 'Server internal tracer', skip: ENV['BATCHED_TASKS'] do +RSpec.describe 'Server internal tracer' do include SidekiqServerExpectations before do diff --git a/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/redis_info_spec.rb b/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/redis_info_spec.rb index b959483fe0f..22fcc12e576 100644 --- a/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/redis_info_spec.rb +++ b/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/redis_info_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require_relative '../support/helper' -RSpec.describe 'Server internal tracer', skip: ENV['BATCHED_TASKS'] do +RSpec.describe 'Server internal tracer' do include SidekiqServerExpectations before do unless Datadog::Tracing::Contrib::Sidekiq::Integration.compatible_with_server_internal_tracing? diff --git a/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/scheduled_poller_spec.rb b/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/scheduled_poller_spec.rb index 9df64b587e7..16c63490070 100644 --- a/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/scheduled_poller_spec.rb +++ b/spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/scheduled_poller_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require_relative '../support/helper' -RSpec.describe 'Server internal tracer', skip: ENV['BATCHED_TASKS'] do +RSpec.describe 'Server internal tracer' do include SidekiqServerExpectations before do diff --git a/tasks/github.rake b/tasks/github.rake index 4bdad523f79..f8fbba07a2f 100644 --- a/tasks/github.rake +++ b/tasks/github.rake @@ -247,6 +247,7 @@ namespace :github do 'push' => { 'branches' => [ 'master', + 'sarahchen6/*' ] }, 'pull_request' => { @@ -340,11 +341,13 @@ namespace :github do matrix = eval(File.read('Matrixfile')).freeze # rubocop:disable Security/Eval exceptions = [ - # 'sidekiq', # Connection refused - connect(2) for 127.0.0.1:6379 (RedisClient::CannotConnectError) + 'sidekiq', + 'crashtracking', + 'main' ] - # candidates = exceptions - candidates = matrix.keys - exceptions + candidates = exceptions + # candidates = matrix.keys - exceptions raise 'No candidates.' if candidates.empty?