From 6ce82deda34e8af9d07cf7dfff0057f33b9e6187 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 23 Dec 2020 15:00:18 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-7-stable-ee --- ...shared_runners_for_transferred_projects_spec.rb | 35 +++++++++++++++++ .../usage_data_counters/hll_redis_counter_spec.rb | 44 ++++++++++++++++++++++ spec/lib/gitlab/usage_data_spec.rb | 26 +++++++++++++ ...anup_transfered_projects_shared_runners_spec.rb | 32 ++++++++++++++++ ...incident_management_activity_shared_examples.rb | 4 +- 5 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 spec/lib/gitlab/background_migration/reset_shared_runners_for_transferred_projects_spec.rb create mode 100644 spec/migrations/20201110161542_cleanup_transfered_projects_shared_runners_spec.rb (limited to 'spec') diff --git a/spec/lib/gitlab/background_migration/reset_shared_runners_for_transferred_projects_spec.rb b/spec/lib/gitlab/background_migration/reset_shared_runners_for_transferred_projects_spec.rb new file mode 100644 index 00000000000..68aa64a1c7d --- /dev/null +++ b/spec/lib/gitlab/background_migration/reset_shared_runners_for_transferred_projects_spec.rb @@ -0,0 +1,35 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Gitlab::BackgroundMigration::ResetSharedRunnersForTransferredProjects, schema: 20201110161542 do + let(:namespaces) { table(:namespaces) } + let(:projects) { table(:projects) } + + let(:namespace_1) { namespaces.create!(name: 'foo', path: 'foo', shared_runners_enabled: true, allow_descendants_override_disabled_shared_runners: false ) } + let(:namespace_2) { namespaces.create!(name: 'foo', path: 'foo', shared_runners_enabled: false, allow_descendants_override_disabled_shared_runners: false ) } + let(:namespace_3) { namespaces.create!(name: 'bar', path: 'bar', shared_runners_enabled: false, allow_descendants_override_disabled_shared_runners: true ) } + let(:project_1_1) { projects.create!(namespace_id: namespace_1.id, shared_runners_enabled: true) } + let(:project_1_2) { projects.create!(namespace_id: namespace_1.id, shared_runners_enabled: false) } + let(:project_2_1) { projects.create!(namespace_id: namespace_2.id, shared_runners_enabled: true) } + let(:project_2_2) { projects.create!(namespace_id: namespace_2.id, shared_runners_enabled: false) } + let(:project_3_1) { projects.create!(namespace_id: namespace_3.id, shared_runners_enabled: true) } + let(:project_3_2) { projects.create!(namespace_id: namespace_3.id, shared_runners_enabled: false) } + + it 'corrects each project shared_runners_enabled column' do + expect do + described_class.new.perform(namespace_1.id, namespace_3.id) + project_1_1.reload + project_1_2.reload + project_2_1.reload + project_2_2.reload + project_3_1.reload + project_3_2.reload + end.to not_change(project_1_1, :shared_runners_enabled).from(true) + .and not_change(project_1_2, :shared_runners_enabled).from(false) + .and change(project_2_1, :shared_runners_enabled).from(true).to(false) + .and not_change(project_2_2, :shared_runners_enabled).from(false) + .and not_change(project_3_1, :shared_runners_enabled).from(true) + .and not_change(project_3_2, :shared_runners_enabled).from(false) + end +end diff --git a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb index 70ee9871486..b6a60c09d3d 100644 --- a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb +++ b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb @@ -283,6 +283,50 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s context 'when no slot is set' do it { expect(described_class.unique_events(event_names: [no_slot], start_date: 7.days.ago, end_date: Date.current)).to eq(1) } end + + context 'when data crosses into new year' do + it 'does not raise error' do + expect { described_class.unique_events(event_names: [weekly_event], start_date: DateTime.parse('2020-12-26'), end_date: DateTime.parse('2021-02-01')) } + .not_to raise_error + end + end + end + end + + describe '.weekly_redis_keys' do + using RSpec::Parameterized::TableSyntax + + let(:weekly_event) { 'g_compliance_dashboard' } + let(:redis_event) { described_class.send(:event_for, weekly_event) } + + subject(:weekly_redis_keys) { described_class.send(:weekly_redis_keys, events: [redis_event], start_date: DateTime.parse(start_date), end_date: DateTime.parse(end_date)) } + + where(:start_date, :end_date, :keys) do + '2020-12-21' | '2020-12-21' | [] + '2020-12-21' | '2020-12-20' | [] + '2020-12-21' | '2020-11-21' | [] + '2021-01-01' | '2020-12-28' | [] + '2020-12-21' | '2020-12-28' | ['g_{compliance}_dashboard-2020-52'] + '2020-12-21' | '2021-01-01' | ['g_{compliance}_dashboard-2020-52'] + '2020-12-27' | '2021-01-01' | ['g_{compliance}_dashboard-2020-52'] + '2020-12-26' | '2021-01-04' | ['g_{compliance}_dashboard-2020-52', 'g_{compliance}_dashboard-2020-53'] + '2020-12-26' | '2021-01-11' | ['g_{compliance}_dashboard-2020-52', 'g_{compliance}_dashboard-2020-53', 'g_{compliance}_dashboard-2021-01'] + '2020-12-26' | '2021-01-17' | ['g_{compliance}_dashboard-2020-52', 'g_{compliance}_dashboard-2020-53', 'g_{compliance}_dashboard-2021-01'] + '2020-12-26' | '2021-01-18' | ['g_{compliance}_dashboard-2020-52', 'g_{compliance}_dashboard-2020-53', 'g_{compliance}_dashboard-2021-01', 'g_{compliance}_dashboard-2021-02'] + end + + with_them do + it "returns the correct keys" do + expect(subject).to match(keys) + end + end + + it 'returns 1 key for last for week' do + expect(described_class.send(:weekly_redis_keys, events: [redis_event], start_date: 7.days.ago.to_date, end_date: Date.current).size).to eq 1 + end + + it 'returns 4 key for last for weeks' do + expect(described_class.send(:weekly_redis_keys, events: [redis_event], start_date: 4.weeks.ago.to_date, end_date: Date.current).size).to eq 4 end end diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb index c2d96369425..4d12bb6bd8c 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/spec/lib/gitlab/usage_data_spec.rb @@ -54,6 +54,32 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do expect { subject }.to raise_error('Stopped calculating recorded_at') end + + context 'when generating usage ping in critical weeks' do + it 'does not raise error when generated in last week of the year' do + travel_to(DateTime.parse('2020-12-29')) do + expect { subject }.not_to raise_error + end + end + + it 'does not raise error when generated in first week of the year' do + travel_to(DateTime.parse('2021-01-01')) do + expect { subject }.not_to raise_error + end + end + + it 'does not raise error when generated in second week of the year' do + travel_to(DateTime.parse('2021-01-07')) do + expect { subject }.not_to raise_error + end + end + + it 'does not raise error when generated in 3rd week of the year' do + travel_to(DateTime.parse('2021-01-14')) do + expect { subject }.not_to raise_error + end + end + end end describe 'usage_activity_by_stage_package' do diff --git a/spec/migrations/20201110161542_cleanup_transfered_projects_shared_runners_spec.rb b/spec/migrations/20201110161542_cleanup_transfered_projects_shared_runners_spec.rb new file mode 100644 index 00000000000..8563114c9f9 --- /dev/null +++ b/spec/migrations/20201110161542_cleanup_transfered_projects_shared_runners_spec.rb @@ -0,0 +1,32 @@ +# frozen_string_literal: true + +require 'spec_helper' +require Rails.root.join('db', 'post_migrate', '20201110161542_cleanup_transfered_projects_shared_runners.rb') + +RSpec.describe CleanupTransferedProjectsSharedRunners, :sidekiq, schema: 20201110161542 do + let(:namespaces) { table(:namespaces) } + let(:migration) { described_class.new } + let(:batch_interval) { described_class::INTERVAL } + + let!(:namespace_1) { namespaces.create!(name: 'foo', path: 'foo') } + let!(:namespace_2) { namespaces.create!(name: 'bar', path: 'bar') } + let!(:namespace_3) { namespaces.create!(name: 'baz', path: 'baz') } + + describe '#up' do + before do + stub_const("#{described_class}::BATCH_SIZE", 2) + end + + it 'schedules ResetSharedRunnersForTransferredProjects background jobs' do + Sidekiq::Testing.fake! do + freeze_time do + migration.up + + expect(BackgroundMigrationWorker.jobs.size).to eq(2) + expect(described_class::MIGRATION).to be_scheduled_delayed_migration(batch_interval, namespace_1.id, namespace_2.id) + expect(described_class::MIGRATION).to be_scheduled_delayed_migration(batch_interval * 2, namespace_3.id, namespace_3.id) + end + end + end + end +end diff --git a/spec/support/shared_examples/lib/gitlab/usage_data_counters/incident_management_activity_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/usage_data_counters/incident_management_activity_shared_examples.rb index 4e35e388b23..788c35dd5bf 100644 --- a/spec/support/shared_examples/lib/gitlab/usage_data_counters/incident_management_activity_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/usage_data_counters/incident_management_activity_shared_examples.rb @@ -3,8 +3,8 @@ RSpec.shared_examples 'an incident management tracked event' do |event| describe ".track_event", :clean_gitlab_redis_shared_state do let(:counter) { Gitlab::UsageDataCounters::HLLRedisCounter } - let(:start_time) { 1.minute.ago } - let(:end_time) { 1.minute.from_now } + let(:start_time) { 1.week.ago } + let(:end_time) { 1.week.from_now } it "tracks the event using redis" do # Allow other subsequent calls -- cgit v1.2.3