diff options
Diffstat (limited to 'spec/lib/backup')
| -rw-r--r-- | spec/lib/backup/files_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/backup/repositories_spec.rb (renamed from spec/lib/backup/repository_spec.rb) | 128 |
2 files changed, 68 insertions, 62 deletions
diff --git a/spec/lib/backup/files_spec.rb b/spec/lib/backup/files_spec.rb index c2dbaac7f15..45cc73974d6 100644 --- a/spec/lib/backup/files_spec.rb +++ b/spec/lib/backup/files_spec.rb @@ -30,7 +30,7 @@ RSpec.describe Backup::Files do let(:timestamp) { Time.utc(2017, 3, 22) } around do |example| - Timecop.freeze(timestamp) { example.run } + travel_to(timestamp) { example.run } end describe 'folders with permission' do diff --git a/spec/lib/backup/repository_spec.rb b/spec/lib/backup/repositories_spec.rb index 718f38f9452..540c64e74ca 100644 --- a/spec/lib/backup/repository_spec.rb +++ b/spec/lib/backup/repositories_spec.rb @@ -2,9 +2,7 @@ require 'spec_helper' -RSpec.describe Backup::Repository do - let_it_be(:project) { create(:project, :wiki_repo) } - +RSpec.describe Backup::Repositories do let(:progress) { StringIO.new } subject { described_class.new(progress) } @@ -12,7 +10,6 @@ RSpec.describe Backup::Repository do before do allow(progress).to receive(:puts) allow(progress).to receive(:print) - allow(FileUtils).to receive(:mv).and_return(true) allow_next_instance_of(described_class) do |instance| allow(instance).to receive(:progress).and_return(progress) @@ -20,13 +17,33 @@ RSpec.describe Backup::Repository do end describe '#dump' do - before do - allow(Gitlab.config.repositories.storages).to receive(:keys).and_return(storage_keys) + let_it_be(:projects) { create_list(:project, 5, :repository) } + + RSpec.shared_examples 'creates repository bundles' do + specify :aggregate_failures do + # Add data to the wiki and design repositories, so they will be included in the dump. + create(:wiki_page, container: project) + create(:design, :with_file, issue: create(:issue, project: project)) + + subject.dump(max_concurrency: 1, max_storage_concurrency: 1) + + expect(File).to exist(File.join(Gitlab.config.backup.path, 'repositories', project.disk_path + '.bundle')) + expect(File).to exist(File.join(Gitlab.config.backup.path, 'repositories', project.disk_path + '.wiki' + '.bundle')) + expect(File).to exist(File.join(Gitlab.config.backup.path, 'repositories', project.disk_path + '.design' + '.bundle')) + end end - let_it_be(:projects) { create_list(:project, 5, :wiki_repo) + [project] } + context 'hashed storage' do + let_it_be(:project) { create(:project, :repository) } + + it_behaves_like 'creates repository bundles' + end - let(:storage_keys) { %w[default test_second_storage] } + context 'legacy storage' do + let_it_be(:project) { create(:project, :repository, :legacy_storage) } + + it_behaves_like 'creates repository bundles' + end context 'no concurrency' do it 'creates the expected number of threads' do @@ -58,7 +75,7 @@ RSpec.describe Backup::Repository do subject.dump(max_concurrency: 1, max_storage_concurrency: 1) end.count - create_list(:project, 2, :wiki_repo) + create_list(:project, 2, :repository) expect do subject.dump(max_concurrency: 1, max_storage_concurrency: 1) @@ -68,6 +85,12 @@ RSpec.describe Backup::Repository do [4, 10].each do |max_storage_concurrency| context "max_storage_concurrency #{max_storage_concurrency}", quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/241701' do + let(:storage_keys) { %w[default test_second_storage] } + + before do + allow(Gitlab.config.repositories.storages).to receive(:keys).and_return(storage_keys) + end + it 'creates the expected number of threads' do expect(Thread).to receive(:new) .exactly(storage_keys.length * (max_storage_concurrency + 1)).times @@ -120,7 +143,7 @@ RSpec.describe Backup::Repository do subject.dump(max_concurrency: 1, max_storage_concurrency: max_storage_concurrency) end.count - create_list(:project, 2, :wiki_repo) + create_list(:project, 2, :repository) expect do subject.dump(max_concurrency: 1, max_storage_concurrency: max_storage_concurrency) @@ -131,45 +154,55 @@ RSpec.describe Backup::Repository do end describe '#restore' do - let(:timestamp) { Time.utc(2017, 3, 22) } - let(:temp_dirs) do - Gitlab.config.repositories.storages.map do |name, storage| - Gitlab::GitalyClient::StorageSettings.allow_disk_access do - File.join(storage.legacy_disk_path, '..', 'repositories.old.' + timestamp.to_i.to_s) - end + let_it_be(:project) { create(:project) } + + it 'restores repositories from bundles', :aggregate_failures do + next_path_to_bundle = [ + Rails.root.join('spec/fixtures/lib/backup/project_repo.bundle'), + Rails.root.join('spec/fixtures/lib/backup/wiki_repo.bundle'), + Rails.root.join('spec/fixtures/lib/backup/design_repo.bundle') + ].to_enum + + allow_next_instance_of(described_class::BackupRestore) do |backup_restore| + allow(backup_restore).to receive(:path_to_bundle).and_return(next_path_to_bundle.next) end - end - around do |example| - Timecop.freeze(timestamp) { example.run } - end + subject.restore + + collect_commit_shas = -> (repo) { repo.commits('master', limit: 10).map(&:sha) } - after do - temp_dirs.each { |path| FileUtils.rm_rf(path) } + expect(collect_commit_shas.call(project.repository)).to eq(['393a7d860a5a4c3cc736d7eb00604e3472bb95ec']) + expect(collect_commit_shas.call(project.wiki.repository)).to eq(['c74b9948d0088d703ee1fafeddd9ed9add2901ea']) + expect(collect_commit_shas.call(project.design_repository)).to eq(['c3cd4d7bd73a51a0f22045c3a4c871c435dc959d']) end describe 'command failure' do before do - # Allow us to set expectations on the project directly expect(Project).to receive(:find_each).and_yield(project) - expect(project.repository).to receive(:create_repository) { raise 'Fail in tests' } + + allow_next_instance_of(DesignManagement::Repository) do |repository| + allow(repository).to receive(:create_repository) { raise 'Fail in tests' } + end + allow_next_instance_of(Repository) do |repository| + allow(repository).to receive(:create_repository) { raise 'Fail in tests' } + end end context 'hashed storage' do it 'shows the appropriate error' do subject.restore - expect(progress).to have_received(:puts).with("[Failed] restoring #{project.full_path} repository") + expect(progress).to have_received(:puts).with("[Failed] restoring #{project.full_path} (#{project.disk_path})") end end context 'legacy storage' do - let!(:project) { create(:project, :legacy_storage) } + let_it_be(:project) { create(:project, :legacy_storage) } it 'shows the appropriate error' do subject.restore - expect(progress).to have_received(:puts).with("[Failed] restoring #{project.full_path} repository") + expect(progress).to have_received(:puts).with("[Failed] restoring #{project.full_path} (#{project.disk_path})") end end end @@ -188,45 +221,18 @@ RSpec.describe Backup::Repository do end it 'cleans existing repositories' do - wiki_repository_spy = spy(:wiki) - - allow_next_instance_of(ProjectWiki) do |project_wiki| - allow(project_wiki).to receive(:repository).and_return(wiki_repository_spy) - end - - expect_next_instance_of(Repository) do |repo| - expect(repo).to receive(:remove) + expect_next_instance_of(DesignManagement::Repository) do |repository| + expect(repository).to receive(:remove) end + expect(Repository).to receive(:new).twice.and_wrap_original do |method, *original_args| + repository = method.call(*original_args) - subject.restore - - expect(wiki_repository_spy).to have_received(:remove) - end - end + expect(repository).to receive(:remove) - describe '#empty_repo?' do - context 'for a wiki' do - let(:wiki) { create(:project_wiki) } - - it 'invalidates the emptiness cache' do - expect(wiki.repository).to receive(:expire_emptiness_caches).once - - subject.send(:empty_repo?, wiki) + repository end - context 'wiki repo has content' do - let!(:wiki_page) { create(:wiki_page, wiki: wiki) } - - it 'returns true, regardless of bad cache value' do - expect(subject.send(:empty_repo?, wiki)).to be(false) - end - end - - context 'wiki repo does not have content' do - it 'returns true, regardless of bad cache value' do - expect(subject.send(:empty_repo?, wiki)).to be_truthy - end - end + subject.restore end end end |