Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Ruby 3.2 to CI #215

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
- ruby: "3.0"
coverage: "yes"
- ruby: "3.1"
- ruby: "3.2"

env:
COVERAGE: ${{ matrix.coverage }}
Expand Down
2 changes: 1 addition & 1 deletion lib/beaker-puppet/helpers/facter_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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<Fixnum>] :acceptable_exit_codes ([0]) An array
# @option opts [Array<Integer>] :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.
Expand Down
14 changes: 7 additions & 7 deletions lib/beaker-puppet/helpers/puppet_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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<Fixnum>] :acceptable_exit_codes ([0]) An array
# @option opts [Array<Integer>] :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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion spec/beaker-puppet/helpers/facter_helpers_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down