diff options
Diffstat (limited to 'qa')
5 files changed, 11 insertions, 16 deletions
diff --git a/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb b/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb index 2ace3f13217..44d9ede64ae 100644 --- a/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb +++ b/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb @@ -81,7 +81,9 @@ module QA Page::Group::BulkImport.perform do |import_page| imported_group - expect { imported_group.import_status }.to eventually_eq('finished').within(duration: 300, interval: 2) + expect { imported_group.import_status }.to( + eventually_eq('finished').within(max_duration: 300, sleep_interval: 2) + ) aggregate_failures do expect(imported_group.reload!).to eq(source_group) diff --git a/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb b/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb index 1b873d35d75..72a0a761294 100644 --- a/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb +++ b/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb @@ -33,7 +33,7 @@ module QA it 'imports Github repo via api', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1858' do imported_project # import the project - expect { imported_project.reload!.import_status }.to eventually_eq('finished').within(duration: 90) + expect { imported_project.reload!.import_status }.to eventually_eq('finished').within(max_duration: 90) aggregate_failures do verify_repository_import diff --git a/qa/qa/specs/features/api/1_manage/import_large_github_repo_spec.rb b/qa/qa/specs/features/api/1_manage/import_large_github_repo_spec.rb index 50baadf3108..91180993189 100644 --- a/qa/qa/specs/features/api/1_manage/import_large_github_repo_spec.rb +++ b/qa/qa/specs/features/api/1_manage/import_large_github_repo_spec.rb @@ -138,7 +138,7 @@ module QA raise "Import of '#{imported_project.name}' failed!" if status == 'failed' end end - expect(import_status).to eventually_eq('finished').within(duration: import_max_duration, interval: 30) + expect(import_status).to eventually_eq('finished').within(max_duration: import_max_duration, sleep_interval: 30) @import_time = Time.now - start aggregate_failures do diff --git a/qa/qa/specs/features/browser_ui/7_configure/kubernetes/kubernetes_integration_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/kubernetes/kubernetes_integration_spec.rb index 1926617fb7e..3a59efe645a 100644 --- a/qa/qa/specs/features/browser_ui/7_configure/kubernetes/kubernetes_integration_spec.rb +++ b/qa/qa/specs/features/browser_ui/7_configure/kubernetes/kubernetes_integration_spec.rb @@ -2,7 +2,7 @@ module QA RSpec.describe 'Configure', except: { job: 'review-qa-*' } do - describe 'Kubernetes Cluster Integration', :requires_admin, :skip_live_env do + describe 'Kubernetes Cluster Integration', :requires_admin, :skip_live_env, :smoke do context 'Project Clusters' do let!(:cluster) { Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create! } let(:project) do diff --git a/qa/spec/support/matchers/eventually_matcher.rb b/qa/spec/support/matchers/eventually_matcher.rb index dc7177cf08a..7a35a3165ae 100644 --- a/qa/spec/support/matchers/eventually_matcher.rb +++ b/qa/spec/support/matchers/eventually_matcher.rb @@ -9,7 +9,7 @@ # expect { Something.that.takes.time.to_appear }.not_to eventually_eq(expected_result) # # With duration and attempts override -# expect { Something.that.takes.time.to_appear }.to eventually_eq(expected_result).within(duration: 10, attempts: 5) +# expect { Something.that.takes.time.to_appear }.to eventually_eq(expected_result).within(max_duration: 10, max_attempts: 5) module Matchers %w[ @@ -21,11 +21,9 @@ module Matchers be_empty ].each do |op| RSpec::Matchers.define(:"eventually_#{op}") do |*expected| - chain(:within) do |options = {}| - @duration = options[:duration] - @attempts = options[:attempts] - @interval = options[:interval] - @reload_page = options[:reload_page] + chain(:within) do |kwargs = {}| + @retry_args = kwargs + @retry_args[:sleep_interval] = 0.5 unless @retry_args[:sleep_interval] end def supports_block_expectations? @@ -57,12 +55,7 @@ module Matchers attempt = 0 QA::Runtime::Logger.debug("Running eventually matcher with '#{operator_msg}' operator") - QA::Support::Retrier.retry_until( - max_attempts: @attempts, - max_duration: @duration, - sleep_interval: @interval || 0.5, - reload_page: @reload_page - ) do + QA::Support::Retrier.retry_until(**@retry_args) do QA::Runtime::Logger.debug("evaluating expectation, attempt: #{attempt += 1}") public_send(expectation_name, actual) |