From b1f81ebc284b3eff85306af075a074dc5ddd3840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 19 Apr 2023 09:21:01 -1000 Subject: [PATCH] Switch form Fixnum to Integer Fixnum was an implementation detail of older Ruby versions and have been the same as Integer since Ruby 2.4. Ruby 3.2 stopped to provide this "alias" so use the proper class name. --- lib/beaker-puppet/helpers/facter_helpers.rb | 2 +- lib/beaker-puppet/helpers/puppet_helpers.rb | 14 +++++++------- spec/beaker-puppet/helpers/facter_helpers_spec.rb | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/beaker-puppet/helpers/facter_helpers.rb b/lib/beaker-puppet/helpers/facter_helpers.rb index 090d248..eab11a7 100644 --- a/lib/beaker-puppet/helpers/facter_helpers.rb +++ b/lib/beaker-puppet/helpers/facter_helpers.rb @@ -9,7 +9,7 @@ module FacterHelpers # @!macro [new] common_opts # @param [Hash{Symbol=>String}] opts Options to alter execution. # @option opts [Boolean] :silent (false) Do not produce log output - # @option opts [Array] :acceptable_exit_codes ([0]) An array + # @option opts [Array] :acceptable_exit_codes ([0]) An array # (or range) of integer exit codes that should be considered # acceptable. An error will be thrown if the exit code does not # match one of the values in this list. diff --git a/lib/beaker-puppet/helpers/puppet_helpers.rb b/lib/beaker-puppet/helpers/puppet_helpers.rb index 02600ca..87dc9ee 100644 --- a/lib/beaker-puppet/helpers/puppet_helpers.rb +++ b/lib/beaker-puppet/helpers/puppet_helpers.rb @@ -29,7 +29,7 @@ def resolve_hostname_on(host, hostname) # @!macro [new] common_opts # @param [Hash{Symbol=>String}] opts Options to alter execution. # @option opts [Boolean] :silent (false) Do not produce log output - # @option opts [Array] :acceptable_exit_codes ([0]) An array + # @option opts [Array] :acceptable_exit_codes ([0]) An array # (or range) of integer exit codes that should be considered # acceptable. An error will be thrown if the exit code does not # match one of the values in this list. @@ -347,8 +347,8 @@ def puppet_conf_for(host, conf_opts) # # @param [Host] host Host the service runs on # @param [String] service Name of the service to restart - # @param [Fixnum] curl_retries Number of seconds to wait for the restart to complete before failing - # @param [Fixnum] port Port to check status at + # @param [Integer] curl_retries Number of seconds to wait for the restart to complete before failing + # @param [Integer] port Port to check status at # # @return [Result] Result of last status check # @!visibility private @@ -697,8 +697,8 @@ def stub_forge(forge_host = nil) # Waits until a successful curl check has happened against puppetdb # # @param [Host] host Host puppetdb is on - # @param [Fixnum] nonssl_port Port to make the HTTP status check over - # @param [Fixnum] ssl_port Port to make the HTTPS status check over + # @param [Integer] nonssl_port Port to make the HTTP status check over + # @param [Integer] ssl_port Port to make the HTTPS status check over # # @return [Result] Result of the last HTTPS status check def sleep_until_puppetdb_started(host, nonssl_port = nil, ssl_port = nil) @@ -724,7 +724,7 @@ def sleep_until_puppetdb_started(host, nonssl_port = nil, ssl_port = nil) # Waits until a successful curl check has happened against puppetserver # # @param [Host] host Host puppetserver is on - # @param [Fixnum] port Port to make the HTTPS status check over + # @param [Integer] port Port to make the HTTPS status check over # # @return [Result] Result of the last HTTPS status check def sleep_until_puppetserver_started(host, port = nil) @@ -736,7 +736,7 @@ def sleep_until_puppetserver_started(host, port = nil) # Waits until a successful curl check has happaned against node classifier # # @param [Host] host Host node classifier is on - # @param [Fixnum] port Port to make the HTTPS status check over + # @param [Integer] port Port to make the HTTPS status check over # # @return [Result] Result of the last HTTPS status check def sleep_until_nc_started(host, port = nil) diff --git a/spec/beaker-puppet/helpers/facter_helpers_spec.rb b/spec/beaker-puppet/helpers/facter_helpers_spec.rb index 055cc23..1bdbb7b 100644 --- a/spec/beaker-puppet/helpers/facter_helpers_spec.rb +++ b/spec/beaker-puppet/helpers/facter_helpers_spec.rb @@ -63,7 +63,7 @@ def logger allow( subject ).to receive( :on ).and_return( result ) structured_fact = subject.fact_on('host','identity') - expect(structured_fact['uid'].class).to be Fixnum + expect(structured_fact['uid'].class).to be Integer expect(structured_fact['user'].class).to be String expect(structured_fact['privileged'].class).to be (TrueClass or FalseClass) end