Skip to content

Commit df592c5

Browse files
committed
WIP
1 parent 19519f1 commit df592c5

File tree

10 files changed

+19
-16
lines changed

10 files changed

+19
-16
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ name: Unit Tests
66
push:
77
branches:
88
- master
9+
- tonycthsu/*
910
pull_request:
1011
branches:
1112
- master

spec/datadog/core/crashtracking/component_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
let(:agent_base_url) { "http://#{hostname}:#{port}" }
213213

214214
[:fiddle, :signal].each do |trigger|
215-
it "reports crashes via http when app crashes with #{trigger}", skip: ENV['BATCHED_TASKS'] do
215+
it "reports crashes via http when app crashes with #{trigger}" do
216216
fork_expectations = proc do |status:, stdout:, stderr:|
217217
expect(Signal.signame(status.termsig)).to eq('SEGV').or eq('ABRT')
218218
expect(stderr).to include('[BUG] Segmentation fault')
@@ -269,7 +269,7 @@
269269
# Do nothing, it's ok
270270
end
271271

272-
it 'reports crashes via uds when app crashes with fiddle', skip: ENV['BATCHED_TASKS'] do
272+
it 'reports crashes via uds when app crashes with fiddle' do
273273
fork_expectations = proc do |status:, stdout:, stderr:|
274274
expect(Signal.signame(status.termsig)).to eq('SEGV').or eq('ABRT')
275275
expect(stderr).to include('[BUG] Segmentation fault')

spec/datadog/core/environment/execution_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969

7070
context 'when in a Pry session' do
7171
it 'returns true' do
72-
skip('Temporarily skipping for batched tests from Github Actions') if ENV['BATCHED_TASKS']
7372
Tempfile.create('test') do |f|
7473
f.write(repl_script)
7574
f.close

spec/datadog/core/telemetry/component_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
end
120120
end
121121

122-
context 'when in fork', skip: ENV['BATCHED_TASKS'] do
122+
context 'when in fork' do
123123
before { skip 'Fork not supported on current platform' unless Process.respond_to?(:fork) }
124124

125125
it do
@@ -169,7 +169,7 @@
169169
end
170170
end
171171

172-
context 'when in fork', skip: ENV['BATCHED_TASKS'] do
172+
context 'when in fork' do
173173
before { skip 'Fork not supported on current platform' unless Process.respond_to?(:fork) }
174174

175175
it do
@@ -209,7 +209,7 @@
209209
end
210210
end
211211

212-
context 'when in fork', skip: ENV['BATCHED_TASKS'] do
212+
context 'when in fork' do
213213
before { skip 'Fork not supported on current platform' unless Process.respond_to?(:fork) }
214214

215215
it do
@@ -245,7 +245,7 @@
245245
expect(worker).to have_received(:enqueue).with(event)
246246
end
247247

248-
context 'when in fork', skip: !Process.respond_to?(:fork) || ENV['BATCHED_TASKS'] do
248+
context 'when in fork', skip: !Process.respond_to?(:fork) do
249249
it do
250250
telemetry
251251
expect_in_fork do

spec/datadog/tracing/contrib/mongodb/client_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
end
106106
end
107107

108-
context 'secondary client', skip: ENV['BATCHED_TASKS'] do
108+
context 'secondary client' do
109109
around do |example|
110110
without_warnings do
111111
# Reset before and after each example; don't allow global state to linger.

spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/heartbeat_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'datadog/tracing/contrib/support/spec_helper'
22
require_relative '../support/helper'
33

4-
RSpec.describe 'Server internal tracer heartbeat', skip: ENV['BATCHED_TASKS'] do
4+
RSpec.describe 'Server internal tracer heartbeat' do
55
include SidekiqServerExpectations
66

77
before do

spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/job_fetch_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'datadog/tracing/contrib/support/spec_helper'
22
require_relative '../support/helper'
33

4-
RSpec.describe 'Server internal tracer', skip: ENV['BATCHED_TASKS'] do
4+
RSpec.describe 'Server internal tracer' do
55
include SidekiqServerExpectations
66

77
before do

spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/redis_info_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'datadog/tracing/contrib/support/spec_helper'
22
require_relative '../support/helper'
33

4-
RSpec.describe 'Server internal tracer', skip: ENV['BATCHED_TASKS'] do
4+
RSpec.describe 'Server internal tracer' do
55
include SidekiqServerExpectations
66
before do
77
unless Datadog::Tracing::Contrib::Sidekiq::Integration.compatible_with_server_internal_tracing?

spec/datadog/tracing/contrib/sidekiq/server_internal_tracer/scheduled_poller_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'datadog/tracing/contrib/support/spec_helper'
22
require_relative '../support/helper'
33

4-
RSpec.describe 'Server internal tracer', skip: ENV['BATCHED_TASKS'] do
4+
RSpec.describe 'Server internal tracer' do
55
include SidekiqServerExpectations
66

77
before do

tasks/github.rake

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require 'pry'
21
require 'json'
32
require 'psych'
43
require 'ostruct'
@@ -243,6 +242,7 @@ namespace :github do
243242
'push' => {
244243
'branches' => [
245244
'master',
245+
'tonycthsu/*',
246246
]
247247
},
248248
'pull_request' => {
@@ -336,11 +336,14 @@ namespace :github do
336336
matrix = eval(File.read('Matrixfile')).freeze # rubocop:disable Security/Eval
337337

338338
exceptions = [
339-
# 'sidekiq', # Connection refused - connect(2) for 127.0.0.1:6379 (RedisClient::CannotConnectError)
339+
'sidekiq',
340+
'main',
341+
'crashtracking',
342+
'mongodb'
340343
]
341344

342-
# candidates = exceptions
343-
candidates = matrix.keys - exceptions
345+
candidates = exceptions
346+
# candidates = matrix.keys - exceptions
344347

345348
raise 'No candidates.' if candidates.empty?
346349

0 commit comments

Comments
 (0)