Commit 65f2e955 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'test-usage-ping-in-timeout-case' into 'master'

Verify that usage ping works when all counts time out

See merge request gitlab-org/gitlab-ce!22358
parents aeaf6686 7a5955ba
...@@ -127,6 +127,13 @@ describe Gitlab::UsageData do ...@@ -127,6 +127,13 @@ describe Gitlab::UsageData do
expect(count_data[:clusters_applications_prometheus]).to eq(1) expect(count_data[:clusters_applications_prometheus]).to eq(1)
expect(count_data[:clusters_applications_runner]).to eq(1) expect(count_data[:clusters_applications_runner]).to eq(1)
end end
it 'works when queries time out' do
allow_any_instance_of(ActiveRecord::Relation)
.to receive(:count).and_raise(ActiveRecord::StatementInvalid.new(''))
expect { subject }.not_to raise_error
end
end end
describe '#features_usage_data_ce' do describe '#features_usage_data_ce' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment