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:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-08-21 15:16:51 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-08-21 15:16:51 +0300
commit4c93668202f8b3a02e3730e696e9ebcd6f08daca (patch)
tree58d45d3f103f743c87a809d157847a309c569978 /spec/workers
parent8417507201809daf0554c13ffb695b8142274f4f (diff)
Remove sidekiq build queue and assign pipeline queue
Diffstat (limited to 'spec/workers')
-rw-r--r--spec/workers/build_coverage_worker_spec.rb2
-rw-r--r--spec/workers/build_finished_worker_spec.rb2
-rw-r--r--spec/workers/build_hooks_worker_spec.rb2
-rw-r--r--spec/workers/build_success_worker_spec.rb2
-rw-r--r--spec/workers/concerns/build_queue_spec.rb14
-rw-r--r--spec/workers/expire_job_cache_worker_spec.rb2
6 files changed, 10 insertions, 14 deletions
diff --git a/spec/workers/build_coverage_worker_spec.rb b/spec/workers/build_coverage_worker_spec.rb
index ba20488f663..e49750f6a3e 100644
--- a/spec/workers/build_coverage_worker_spec.rb
+++ b/spec/workers/build_coverage_worker_spec.rb
@@ -20,4 +20,6 @@ describe BuildCoverageWorker do
end
end
end
+
+ it_behaves_like 'sidekiq_worker'
end
diff --git a/spec/workers/build_finished_worker_spec.rb b/spec/workers/build_finished_worker_spec.rb
index 2868167c7d4..463e8c6a60a 100644
--- a/spec/workers/build_finished_worker_spec.rb
+++ b/spec/workers/build_finished_worker_spec.rb
@@ -27,4 +27,6 @@ describe BuildFinishedWorker do
end
end
end
+
+ it_behaves_like 'sidekiq worker'
end
diff --git a/spec/workers/build_hooks_worker_spec.rb b/spec/workers/build_hooks_worker_spec.rb
index 97654a93f5c..3d98ffabf0a 100644
--- a/spec/workers/build_hooks_worker_spec.rb
+++ b/spec/workers/build_hooks_worker_spec.rb
@@ -20,4 +20,6 @@ describe BuildHooksWorker do
end
end
end
+
+ it_behaves_like 'sidekiq worker'
end
diff --git a/spec/workers/build_success_worker_spec.rb b/spec/workers/build_success_worker_spec.rb
index dba70883130..a82ed5c187d 100644
--- a/spec/workers/build_success_worker_spec.rb
+++ b/spec/workers/build_success_worker_spec.rb
@@ -33,4 +33,6 @@ describe BuildSuccessWorker do
end
end
end
+
+ it_behaves_like 'sidekiq worker'
end
diff --git a/spec/workers/concerns/build_queue_spec.rb b/spec/workers/concerns/build_queue_spec.rb
deleted file mode 100644
index 6bf955e0be2..00000000000
--- a/spec/workers/concerns/build_queue_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe BuildQueue do
- let(:worker) do
- Class.new do
- include Sidekiq::Worker
- include BuildQueue
- end
- end
-
- it 'sets the queue name of a worker' do
- expect(worker.sidekiq_options['queue'].to_s).to eq('build')
- end
-end
diff --git a/spec/workers/expire_job_cache_worker_spec.rb b/spec/workers/expire_job_cache_worker_spec.rb
index 1b614342a18..552e2c350de 100644
--- a/spec/workers/expire_job_cache_worker_spec.rb
+++ b/spec/workers/expire_job_cache_worker_spec.rb
@@ -28,4 +28,6 @@ describe ExpireJobCacheWorker do
end
end
end
+
+ it_behaves_like 'sidekiq worker'
end