Merge pull request #204 from Fryguy/fix_sporadic_test_failure

Fix sporadic test failure (cherry picked from commit f43972a)
ManageIQ · Jun 30, 2023 · 4db9ba0 · 4db9ba0
1 parent 93e78c9
commit 4db9ba0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/lib/manageiq/appliance_console/database_replication.rb b/lib/manageiq/appliance_console/database_replication.rb
@@ -151,8 +151,8 @@ def run_repmgr_command(cmd, params = {})
         end
       end
 
-      Process.wait(pid)
-      $CHILD_STATUS.success?
+      pid, status = Process.wait2(pid)
+      status.success?
     end
 
     def primary_connection_hash

diff --git a/spec/cli_spec.rb b/spec/cli_spec.rb
@@ -711,6 +711,8 @@
     let(:replication_standby) { ManageIQ::ApplianceConsole::DatabaseReplicationStandby.new }
 
     before do
+      pending "does not work on macOS because `ip` command is not available" if RUBY_PLATFORM.match?(/darwin/)
+
       allow(ManageIQ::ApplianceConsole::DatabaseReplicationPrimary).to receive(:new).and_return(replication_primary)
       allow(ManageIQ::ApplianceConsole::DatabaseReplicationStandby).to receive(:new).and_return(replication_standby)
     end

diff --git a/spec/database_replication_standby_spec.rb b/spec/database_replication_standby_spec.rb
@@ -190,8 +190,9 @@
           }
         ]
 
-        expect(Process).to receive(:wait).with(1234)
+        expect(Process).to receive(:wait2).with(1234).and_return([1234, double(:success? => true)])
         expect(AwesomeSpawn).to receive(:run!).with(*run_args).and_return(double(:output => "success"))
+
         expect(subject.register_standby_server).to be true
       end
     end