Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-05-02 15:25:08 +0300
committerShinya Maeda <shinya@gitlab.com>2018-05-02 15:25:08 +0300
commitae76f0c3b5d9978153d335434fffeb35f2703b90 (patch)
treee9ba54b9104acf557c1b518e2f112249b7c55829
parent40fa5ae7bf368ebe691a643a0c32b9efd2181bb9 (diff)
parent7d626c41ccb4531dceeb1d1025c067bac3c63c4d (diff)
Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all
-rw-r--r--app/models/ci/build_trace_chunk.rb2
-rw-r--r--app/workers/build_trace_chunk_flush_to_db_worker.rb2
-rw-r--r--spec/models/ci/build_trace_chunk_spec.rb4
3 files changed, 4 insertions, 4 deletions
diff --git a/app/models/ci/build_trace_chunk.rb b/app/models/ci/build_trace_chunk.rb
index 3f2cdeb46fc..bdba9e6ed3c 100644
--- a/app/models/ci/build_trace_chunk.rb
+++ b/app/models/ci/build_trace_chunk.rb
@@ -120,7 +120,7 @@ module Ci
def schedule_to_db
return if db?
- BuildTraceChunkFlushToDBWorker.perform_async(id)
+ BuildTraceChunkFlushToDbWorker.perform_async(id)
end
def fullfilled?
diff --git a/app/workers/build_trace_chunk_flush_to_db_worker.rb b/app/workers/build_trace_chunk_flush_to_db_worker.rb
index 447dfc4d229..495118f7c14 100644
--- a/app/workers/build_trace_chunk_flush_to_db_worker.rb
+++ b/app/workers/build_trace_chunk_flush_to_db_worker.rb
@@ -1,4 +1,4 @@
-class BuildTraceChunkFlushToDBWorker
+class BuildTraceChunkFlushToDbWorker
include ApplicationWorker
include PipelineQueue
diff --git a/spec/models/ci/build_trace_chunk_spec.rb b/spec/models/ci/build_trace_chunk_spec.rb
index 4a58971a441..dbeee74857c 100644
--- a/spec/models/ci/build_trace_chunk_spec.rb
+++ b/spec/models/ci/build_trace_chunk_spec.rb
@@ -75,7 +75,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
let(:value) { 'a' * described_class::CHUNK_SIZE }
it 'schedules stashing data' do
- expect(BuildTraceChunkFlushToDBWorker).to receive(:perform_async).once
+ expect(BuildTraceChunkFlushToDbWorker).to receive(:perform_async).once
subject
end
@@ -112,7 +112,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
context 'when fullfilled chunk size' do
it 'does not schedule stashing data' do
- expect(BuildTraceChunkFlushToDBWorker).not_to receive(:perform_async)
+ expect(BuildTraceChunkFlushToDbWorker).not_to receive(:perform_async)
subject
end