diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-27 16:09:33 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 23:28:26 +0300 |
| commit | a22f6fa6e50bb31921415b01fd345d6802581390 (patch) | |
| tree | 4e617f85dd0500b1c0bb004f9a4ed3e2000df818 /spec/uploaders/job_artifact_uploader_spec.rb | |
| parent | b4dc556c2f40f2e8e4d71c5dd8d1747974f8147f (diff) | |
Merge branch 'fix/sm/atomic-migration' into 'master'
Fix migrate! method (Minimal fix with ExclusiveLock to prevent race conditions)
Closes #4928 and #4980
See merge request gitlab-org/gitlab-ee!4624
Diffstat (limited to 'spec/uploaders/job_artifact_uploader_spec.rb')
| -rw-r--r-- | spec/uploaders/job_artifact_uploader_spec.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/uploaders/job_artifact_uploader_spec.rb b/spec/uploaders/job_artifact_uploader_spec.rb index 0bcf28f2c1c..714b2498538 100644 --- a/spec/uploaders/job_artifact_uploader_spec.rb +++ b/spec/uploaders/job_artifact_uploader_spec.rb @@ -67,4 +67,14 @@ describe JobArtifactUploader do it { is_expected.to include("/#{job_artifact.job_id}/#{job_artifact.id}/") } it { is_expected.to end_with("ci_build_artifacts.zip") } end + + describe "#migrate!" do + before do + uploader.store!(fixture_file_upload(Rails.root.join('spec/fixtures/trace/sample_trace'))) + stub_artifacts_object_storage + end + + it_behaves_like "migrates", to_store: described_class::Store::REMOTE + it_behaves_like "migrates", from_store: described_class::Store::REMOTE, to_store: described_class::Store::LOCAL + end end |