diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-01 18:07:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-01 18:07:45 +0300 |
commit | 1219a9dce91f4edbc135dfc08299b4122b4825a8 (patch) | |
tree | e7d12a55d75a2d56e60d9527bef3724e3578866d /spec/services/repository_archive_clean_up_service_spec.rb | |
parent | 1a0d6dbdc2ac3047f4953a359ef27ba6e26074ae (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/repository_archive_clean_up_service_spec.rb')
-rw-r--r-- | spec/services/repository_archive_clean_up_service_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/services/repository_archive_clean_up_service_spec.rb b/spec/services/repository_archive_clean_up_service_spec.rb index 60a14d7a107..c0b286ac675 100644 --- a/spec/services/repository_archive_clean_up_service_spec.rb +++ b/spec/services/repository_archive_clean_up_service_spec.rb @@ -9,7 +9,7 @@ describe RepositoryArchiveCleanUpService do let(:sha) { "0" * 40 } it 'removes outdated archives and directories in a new-style path' do - in_directory_with_files("project-999/#{sha}", %w[tar tar.bz2 tar.gz zip], 3.hours) do |dirname, files| + in_directory_with_files("project-#{non_existing_record_id}/#{sha}", %w[tar tar.bz2 tar.gz zip], 3.hours) do |dirname, files| service.execute files.each { |filename| expect(File.exist?(filename)).to be_falsy } @@ -19,7 +19,7 @@ describe RepositoryArchiveCleanUpService do end it 'does not remove directories when they contain outdated non-archives' do - in_directory_with_files("project-999/#{sha}", %w[tar conf rb], 2.hours) do |dirname, files| + in_directory_with_files("project-#{non_existing_record_id}/#{sha}", %w[tar conf rb], 2.hours) do |dirname, files| service.execute expect(File.directory?(dirname)).to be_truthy @@ -27,7 +27,7 @@ describe RepositoryArchiveCleanUpService do end it 'does not remove in-date archives in a new-style path' do - in_directory_with_files("project-999/#{sha}", %w[tar tar.bz2 tar.gz zip], 1.hour) do |dirname, files| + in_directory_with_files("project-#{non_existing_record_id}/#{sha}", %w[tar tar.bz2 tar.gz zip], 1.hour) do |dirname, files| service.execute files.each { |filename| expect(File.exist?(filename)).to be_truthy } |