Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/lib/gitlab/sidekiq_cluster/cli_spec.rb b/spec/lib/gitlab/sidekiq_cluster/cli_spec.rb
index 72727aab601..fa23bf8958c 100644
--- a/spec/lib/gitlab/sidekiq_cluster/cli_spec.rb
+++ b/spec/lib/gitlab/sidekiq_cluster/cli_spec.rb
@@ -236,7 +236,7 @@ describe Gitlab::SidekiqCluster::CLI do
         .with([]).and_return([])
 
       expect(Gitlab::SidekiqCluster).to receive(:signal_processes)
-        .with([], :KILL)
+        .with([], "-KILL")
 
       stub_const("Gitlab::SidekiqCluster::CLI::CHECK_TERMINATE_INTERVAL_SECONDS", 0.1)
       allow(cli).to receive(:terminate_timeout_seconds) { 1 }
@@ -264,7 +264,7 @@ describe Gitlab::SidekiqCluster::CLI do
           .with(worker_pids).and_return([102])
 
         expect(Gitlab::SidekiqCluster).to receive(:signal_processes)
-          .with([102], :KILL)
+          .with([102], "-KILL")
 
         cli.run(%w(foo))
 
diff --git a/spec/lib/gitlab/sidekiq_cluster_spec.rb b/spec/lib/gitlab/sidekiq_cluster_spec.rb
index 9316ac29dd6..3f466e9f2a3 100644
--- a/spec/lib/gitlab/sidekiq_cluster_spec.rb
+++ b/spec/lib/gitlab/sidekiq_cluster_spec.rb
@@ -44,7 +44,7 @@ describe Gitlab::SidekiqCluster do
   end
 
   describe '.signal_processes' do
-    it 'sends a signal to every thread' do
+    it 'sends a signal to every given process' do
       expect(described_class).to receive(:signal).with(1, :INT)
 
       described_class.signal_processes([1], :INT)