diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-15 21:09:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-15 21:09:43 +0300 |
commit | f784f7d3b19fe80834240bde23d1300accb01118 (patch) | |
tree | 2acd4a74cbcde10c5b70c356b146af78362862d1 /spec/requests/api | |
parent | 06c127aa72cff78235426341081837cff0b6f78b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api')
-rw-r--r-- | spec/requests/api/ci/runner/jobs_put_spec.rb | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/spec/requests/api/ci/runner/jobs_put_spec.rb b/spec/requests/api/ci/runner/jobs_put_spec.rb index 025747f2f0c..183a3b26e00 100644 --- a/spec/requests/api/ci/runner/jobs_put_spec.rb +++ b/spec/requests/api/ci/runner/jobs_put_spec.rb @@ -105,6 +105,67 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do it { expect(job).to be_unmet_prerequisites } end + + context 'when unmigrated live trace chunks exist' do + context 'when accepting trace feature is enabled' do + before do + stub_feature_flags(ci_accept_trace: true) + end + + context 'when checksum is present' do + context 'when live trace chunk is still live' do + it 'responds with 202' do + update_job(state: 'success', checksum: 'crc32:12345678') + + expect(job.pending_state).to be_present + expect(response).to have_gitlab_http_status(:accepted) + end + end + + context 'when runner retries request after receiving 202' do + it 'responds with 202 and then with 200', :sidekiq_inline do + perform_enqueued_jobs do + update_job(state: 'success', checksum: 'crc32:12345678') + end + + expect(job.reload.pending_state).to be_present + expect(response).to have_gitlab_http_status(:accepted) + + perform_enqueued_jobs do + update_job(state: 'success', checksum: 'crc32:12345678') + end + + expect(job.reload.pending_state).not_to be_present + expect(response).to have_gitlab_http_status(:ok) + end + end + + context 'when live trace chunk has been migrated' do + before do + job.trace_chunks.first.update!(data_store: :database) + end + + it 'responds with 200' do + update_job(state: 'success', checksum: 'crc:12345678') + + expect(job.reload).to be_success + expect(job.pending_state).not_to be_present + expect(response).to have_gitlab_http_status(:ok) + end + end + end + + context 'when checksum is not present' do + it 'responds with 200' do + update_job(state: 'success') + + expect(job.reload).to be_success + expect(job.pending_state).not_to be_present + expect(response).to have_gitlab_http_status(:ok) + end + end + end + end end context 'when trace is given' do |