From 9e464a184ab2300ee48e665076349e9c3de22f24 Mon Sep 17 00:00:00 2001 From: Kenyon Ralph Date: Sun, 26 Nov 2023 15:52:16 -0800 Subject: [PATCH 1/2] Add Fedora 39 support --- lib/beaker-hostgenerator/data.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb index ef30676c..c42de79d 100644 --- a/lib/beaker-hostgenerator/data.rb +++ b/lib/beaker-hostgenerator/data.rb @@ -1078,7 +1078,7 @@ def generate_osinfo yield %w[aix73-POWER aix-7.3-power] # Fedora - (19..38).each do |release| + (19..39).each do |release| # 32 bit support was dropped in Fedora 31 yield ["fedora#{release}-32", "fedora-#{release}-i386"] if release < 31 From 32884b38ffe388e9a41d9d35559bae814c31c140 Mon Sep 17 00:00:00 2001 From: Kenyon Ralph Date: Sun, 26 Nov 2023 16:01:05 -0800 Subject: [PATCH 2/2] spec/helpers.rb: rubocop autocorrect RSpec/ReceiveMessages --- spec/helpers.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spec/helpers.rb b/spec/helpers.rb index d68c52a6..990d8cd3 100644 --- a/spec/helpers.rb +++ b/spec/helpers.rb @@ -64,8 +64,7 @@ def generate_result(name, opts) stderr = opts.has_key?(:stderr) ? opts[:stderr] : name exit_code = opts.has_key?(:exit_code) ? opts[:exit_code] : 0 exit_code = [exit_code].flatten - allow(result).to receive(:stdout).and_return(stdout) - allow(result).to receive(:stderr).and_return(stderr) + allow(result).to receive_messages(stdout: stdout, stderr: stderr) allow(result).to receive(:exit_code).and_return(*exit_code) result end @@ -79,9 +78,7 @@ def make_host(name, host_hash) host = make_opts.merge(host_hash) - allow(host).to receive(:name).and_return(name) - allow(host).to receive(:to_s).and_return(name) - allow(host).to receive(:exec).and_return(generate_result(name, host_hash)) + allow(host).to receive_messages(name: name, to_s: name, exec: generate_result(name, host_hash)) host end