Add latest changes from gitlab-org/gitlab@master

1 files changed, 27 insertions, 23 deletions

diff --git a/spec/lib/gitlab/health_checks/master_check_spec.rb b/spec/lib/gitlab/health_checks/master_check_spec.rb
index 8a87b01c560..5cd26f6302a 100644
--- a/spec/lib/gitlab/health_checks/master_check_spec.rb
+++ b/spec/lib/gitlab/health_checks/master_check_spec.rb
@@ -4,16 +4,14 @@ require 'fast_spec_helper'
 require_relative './simple_check_shared'
 
 RSpec.describe Gitlab::HealthChecks::MasterCheck do
-  before do
-    stub_const('SUCCESS_CODE', 100)
-    stub_const('FAILURE_CODE', 101)
-  end
-
   context 'when Puma runs in Clustered mode' do
     before do
       allow(Gitlab::Runtime).to receive(:puma_in_clustered_mode?).and_return(true)
 
-      described_class.register_master
+      # We need to capture the read pipe here to stub out the non-blocking read.
+      # The original implementation actually forked the test suite for a more
+      # end-to-end test but that caused knock-on effects on other tests.
+      @pipe_read, _ = described_class.register_master
     end
 
     after do
@@ -25,34 +23,40 @@ RSpec.describe Gitlab::HealthChecks::MasterCheck do
     end
 
     describe '.readiness' do
-      context 'when master is running' do
-        it 'worker does return success' do
-          _, child_status = run_worker
-
-          expect(child_status.exitstatus).to eq(SUCCESS_CODE)
+      context 'when no worker registered' do
+        it 'succeeds' do
+          expect(described_class.readiness.success).to be(true)
         end
       end
 
-      context 'when master finishes early' do
-        before do
-          described_class.send(:close_write)
+      context 'when worker registers itself' do
+        context 'when reading from pipe succeeds' do
+          it 'succeeds' do
+            expect(@pipe_read).to receive(:read_nonblock) # rubocop: disable RSpec/InstanceVariable
+
+            described_class.register_worker
+
+            expect(described_class.readiness.success).to be(true)
+          end
         end
 
-        it 'worker does return failure' do
-          _, child_status = run_worker
+        context 'when read pipe is open but not ready for reading' do
+          it 'succeeds' do
+            expect(@pipe_read).to receive(:read_nonblock).and_raise(IO::EAGAINWaitReadable) # rubocop: disable RSpec/InstanceVariable
+
+            described_class.register_worker
 
-          expect(child_status.exitstatus).to eq(FAILURE_CODE)
+            expect(described_class.readiness.success).to be(true)
+          end
         end
       end
 
-      def run_worker
-        pid = fork do
-          described_class.register_worker
+      context 'when master finishes early' do
+        it 'fails' do
+          described_class.finish_master
 
-          exit(described_class.readiness.success ? SUCCESS_CODE : FAILURE_CODE)
+          expect(described_class.readiness.success).to be(false)
         end
-
-        Process.wait2(pid)
       end
     end
   end