diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /spec/support/shared_examples/workers | |
parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) | |
download | gitlab-ce-a7b3560714b4d9cc4ab32dffcd1f74a284b93580.tar.gz |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'spec/support/shared_examples/workers')
-rw-r--r-- | spec/support/shared_examples/workers/background_migration_worker_shared_examples.rb | 16 | ||||
-rw-r--r-- | spec/support/shared_examples/workers/project_export_shared_examples.rb | 16 |
2 files changed, 19 insertions, 13 deletions
diff --git a/spec/support/shared_examples/workers/background_migration_worker_shared_examples.rb b/spec/support/shared_examples/workers/background_migration_worker_shared_examples.rb index 0d3e158d358..7fdf049a823 100644 --- a/spec/support/shared_examples/workers/background_migration_worker_shared_examples.rb +++ b/spec/support/shared_examples/workers/background_migration_worker_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -RSpec.shared_examples 'it runs background migration jobs' do |tracking_database, metric_name| +RSpec.shared_examples 'it runs background migration jobs' do |tracking_database| describe 'defining the job attributes' do it 'defines the data_consistency as always' do expect(described_class.get_data_consistency).to eq(:always) @@ -33,16 +33,6 @@ RSpec.shared_examples 'it runs background migration jobs' do |tracking_database, end end - describe '.unhealthy_metric_name' do - it 'does not raise an error' do - expect { described_class.unhealthy_metric_name }.not_to raise_error - end - - it 'overrides the method to return the unhealthy metric name' do - expect(described_class.unhealthy_metric_name).to eq(metric_name) - end - end - describe '.minimum_interval' do it 'returns 2 minutes' do expect(described_class.minimum_interval).to eq(2.minutes.to_i) @@ -189,11 +179,11 @@ RSpec.shared_examples 'it runs background migration jobs' do |tracking_database, end it 'increments the unhealthy counter' do - counter = Gitlab::Metrics.counter(metric_name, 'msg') + counter = Gitlab::Metrics.counter(:background_migration_database_health_reschedules, 'msg') expect(described_class).to receive(:perform_in) - expect { worker.perform('Foo', [10, 20]) }.to change { counter.get }.by(1) + expect { worker.perform('Foo', [10, 20]) }.to change { counter.get(db_config_name: tracking_database) }.by(1) end context 'when lease_attempts is 0' do diff --git a/spec/support/shared_examples/workers/project_export_shared_examples.rb b/spec/support/shared_examples/workers/project_export_shared_examples.rb index a9bcc3f4f7c..175ef9bd012 100644 --- a/spec/support/shared_examples/workers/project_export_shared_examples.rb +++ b/spec/support/shared_examples/workers/project_export_shared_examples.rb @@ -53,6 +53,10 @@ RSpec.shared_examples 'export worker' do it 'does not raise an exception when strategy is invalid' do expect(::Projects::ImportExport::ExportService).not_to receive(:new) + expect_next_instance_of(ProjectExportJob) do |job| + expect(job).to receive(:finish) + end + expect { subject.perform(user.id, project.id, { 'klass' => 'Whatever' }) }.not_to raise_error end @@ -63,6 +67,18 @@ RSpec.shared_examples 'export worker' do it 'does not raise error when user cannot be found' do expect { subject.perform(non_existing_record_id, project.id, {}) }.not_to raise_error end + + it 'fails the export job status' do + expect_next_instance_of(::Projects::ImportExport::ExportService) do |service| + expect(service).to receive(:execute).and_raise(Gitlab::ImportExport::Error) + end + + expect_next_instance_of(ProjectExportJob) do |job| + expect(job).to receive(:fail_op) + end + + expect { subject.perform(user.id, project.id, {}) }.to raise_error(Gitlab::ImportExport::Error) + end end end |