diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-01 21:11:40 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-01 21:11:40 +0300 |
commit | 3bfb19d99e3508b2a42c49d09e5a3236d2ce3a29 (patch) | |
tree | dc3a6a664e81caaa99530260ad56821479a8a939 /spec/initializers | |
parent | 18d5458781b21dee4dbb8854c72c064e9bd808ed (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/initializers')
-rw-r--r-- | spec/initializers/memory_watchdog_spec.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/spec/initializers/memory_watchdog_spec.rb b/spec/initializers/memory_watchdog_spec.rb index 92834c889c2..ef24da0071b 100644 --- a/spec/initializers/memory_watchdog_spec.rb +++ b/spec/initializers/memory_watchdog_spec.rb @@ -2,7 +2,7 @@ require 'fast_spec_helper' -RSpec.describe 'memory watchdog' do +RSpec.describe 'memory watchdog', feature_category: :application_performance do shared_examples 'starts configured watchdog' do |configure_monitor_method| shared_examples 'configures and starts watchdog' do it "correctly configures and starts watchdog", :aggregate_failures do @@ -104,11 +104,7 @@ RSpec.describe 'memory watchdog' do allow(Gitlab::Runtime).to receive(:sidekiq?).and_return(true) end - it 'does not register life-cycle hook' do - expect(Gitlab::Cluster::LifecycleEvents).not_to receive(:on_worker_start) - - run_initializer - end + it_behaves_like 'starts configured watchdog', :configure_for_sidekiq end end end |