diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 18:09:16 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 18:09:16 +0000 |
commit | 80e9fdc9682cfbcfb9202a2733605a6a6bd23f05 (patch) | |
tree | 168375ea13d1a1f01d4cbcf6f0513fc9883e9477 /spec/lib/gitlab | |
parent | 5372e109c0660e4670aa987568a51082beca1b3c (diff) | |
download | gitlab-ce-80e9fdc9682cfbcfb9202a2733605a6a6bd23f05.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r-- | spec/lib/gitlab/sidekiq_cluster/cli_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/sidekiq_cluster_spec.rb | 2 |
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) |