From d66780b2af1ed90d0a696753640261877f4e6bc5 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Tue, 16 Jan 2024 21:08:33 +0800 Subject: [PATCH] Gradually stop using rspec-retry Need to quarantine spec/lib/service_ping/build_payload_spec.rb because it does not pass without retrying. --- spec/lib/service_ping/build_payload_spec.rb | 3 ++- spec/spec_helper.rb | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/spec/lib/service_ping/build_payload_spec.rb b/spec/lib/service_ping/build_payload_spec.rb index 6699310681add4..8d2b5311be3443 100644 --- a/spec/lib/service_ping/build_payload_spec.rb +++ b/spec/lib/service_ping/build_payload_spec.rb @@ -3,7 +3,8 @@ require 'spec_helper' RSpec.describe ServicePing::BuildPayload, feature_category: :service_ping do - describe '#execute', :without_license do + describe '#execute', :without_license, + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/438582' do subject(:service_ping_payload) { described_class.new.execute } include_context 'stubbed service ping metrics definitions' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3dfc27b8511dfa..d08f6ef9d0dd0e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -223,6 +223,14 @@ example.metadata[:retry] = 1 end + # Gradually stop using rspec-retry + # See https://gitlab.com/gitlab-org/gitlab/-/issues/438388 + %i[lib migrations models requests services].each do |type| + config.prepend_before(:each, type: type) do |example| + example.metadata[:retry] = 1 + end + end + config.exceptions_to_hard_fail = [DeprecationToolkitEnv::DeprecationBehaviors::SelectiveRaise::RaiseDisallowedDeprecation] end -- GitLab