Skip to content

Commit f3e0eca

Browse files
mhashizumemhashizume
authored
Merge pull request #81 from AriaXLi/PA-5781/beaker5
(PA-5781) Use Beaker 5
2 parents 22ed5fb + 2e439b3 commit f3e0eca

File tree

10 files changed

+69
-69
lines changed

10 files changed

+69
-69
lines changed

‎.sync.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,18 @@ Gemfile:
1515
optional:
1616
":development":
1717
- gem: beaker
18-
version: '~> 4.30'
18+
version: '~> 5.0'
1919
from_env: BEAKER_VERSION
2020
- gem: beaker-abs
2121
from_env: BEAKER_ABS_VERSION
22-
version: '~> 0.9'
23-
- gem: beaker-pe
22+
version: '~> 1.0'
2423
- gem: beaker-hostgenerator
2524
from_env: BEAKER_HOSTGENERATOR_VERSION
2625
- gem: beaker-rspec
2726
from_env: BEAKER_RSPEC_VERSION
2827
- gem: beaker-puppet
2928
from_env: BEAKER_PUPPET_VERSION
30-
version: '~> 1.22'
29+
version: '~> 3.0'
3130
# We can unpin async when we move to Ruby 3
3231
- gem: async
3332
version: '~> 1'

‎Gemfile

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,37 @@ def location_for(place_or_version, fake_version = nil)
1414
end
1515

1616
group :development do
17-
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
18-
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
19-
gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
20-
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
21-
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
22-
gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23-
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
24-
gem "facterdb", '~> 1.18', require: false
25-
gem "metadata-json-lint", '~> 3.0', require: false
26-
gem "puppetlabs_spec_helper", '~> 6.0', require: false
27-
gem "rspec-puppet-facts", '~> 2.0', require: false
28-
gem "codecov", '~> 0.2', require: false
29-
gem "dependency_checker", '~> 1.0.0', require: false
30-
gem "parallel_tests", '= 3.12.1', require: false
31-
gem "pry", '~> 0.10', require: false
32-
gem "simplecov-console", '~> 0.5', require: false
33-
gem "puppet-debugger", '~> 1.0', require: false
34-
gem "rubocop", '= 1.48.1', require: false
35-
gem "rubocop-performance", '= 1.16.0', require: false
36-
gem "rubocop-rspec", '= 2.19.0', require: false
37-
gem "puppet-strings", '~> 4.0', require: false
38-
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
39-
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.30')
40-
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.9')
41-
gem "beaker-pe", require: false
17+
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
18+
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
19+
gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
20+
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
21+
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
22+
gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23+
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
24+
gem "facterdb", '~> 1.18', require: false
25+
gem "metadata-json-lint", '~> 3.0', require: false
26+
gem "puppetlabs_spec_helper", '~> 6.0', require: false
27+
gem "rspec-puppet-facts", '~> 2.0', require: false
28+
gem "codecov", '~> 0.2', require: false
29+
gem "dependency_checker", '~> 1.0.0', require: false
30+
gem "parallel_tests", '= 3.12.1', require: false
31+
gem "pry", '~> 0.10', require: false
32+
gem "simplecov-console", '~> 0.5', require: false
33+
gem "puppet-debugger", '~> 1.0', require: false
34+
gem "rubocop", '= 1.48.1', require: false
35+
gem "rubocop-performance", '= 1.16.0', require: false
36+
gem "rubocop-rspec", '= 2.19.0', require: false
37+
gem "puppet-strings", '~> 4.0', require: false
38+
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
39+
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 5.0')
40+
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 1.0')
4241
gem "beaker-hostgenerator"
4342
gem "beaker-rspec"
44-
gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 1.22')
45-
gem "async", '~> 1', require: false
46-
gem "beaker-module_install_helper", require: false
47-
gem "beaker-puppet_install_helper", require: false
48-
gem "nokogiri", require: false
43+
gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 3.0')
44+
gem "async", '~> 1', require: false
45+
gem "beaker-module_install_helper", require: false
46+
gem "beaker-puppet_install_helper", require: false
47+
gem "nokogiri", require: false
4948
end
5049
group :system_tests do
5150
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]

‎spec/acceptance/tests/resource/ssh_authorized_key/create_spec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"key='mykey'"]
3131
on(agent, puppet_resource('ssh_authorized_key', name.to_s, args))
3232

33-
on(agent, "cat #{auth_keys}") do |_res|
34-
fail_test "didn't find the ssh_authorized_key for #{name}" unless stdout.include? name.to_s
33+
on(agent, "cat #{auth_keys}") do |res|
34+
fail_test "didn't find the ssh_authorized_key for #{name}" unless res.stdout.include? name.to_s
3535
end
3636
end
3737

@@ -44,8 +44,8 @@
4444
"target='#{custom_key}'"]
4545
on(agent, puppet_resource('ssh_authorized_key', name.to_s, args))
4646

47-
on(agent, "cat #{custom_key}") do |_res|
48-
fail_test "didn't find the ssh_authorized_key for #{name}" unless stdout.include? name.to_s
47+
on(agent, "cat #{custom_key}") do |res|
48+
fail_test "didn't find the ssh_authorized_key for #{name}" unless res.stdout.include? name.to_s
4949
end
5050
on(agent, "rm -rf #{custom_key_directory}")
5151
end
@@ -64,8 +64,8 @@
6464
"key='mykey'",
6565
'drop_privileges=false',
6666
"target=/home/testuser/tmp/ssh_authorized_keys_#{name}/authorized_keys_#{name}"]
67-
on(agent, puppet_resource('ssh_authorized_key', name.to_s, args)) do |_res|
68-
fail_test unless stderr.include?('the target path is not trusted')
67+
on(agent, puppet_resource('ssh_authorized_key', name.to_s, args)) do |res|
68+
fail_test unless res.stderr.include?('the target path is not trusted')
6969
end
7070
on(agent, "rm -rf #{custom_key_directory}")
7171

@@ -80,8 +80,8 @@
8080
"key='mykey'",
8181
'drop_privileges=false',
8282
"target='#{custom_key}'"]
83-
on(agent, puppet_resource('ssh_authorized_key', name.to_s, args), acceptable_exit_codes: [0, 1]) do |_res|
84-
fail_test unless stderr.include?('the target path is not trusted')
83+
on(agent, puppet_resource('ssh_authorized_key', name.to_s, args), acceptable_exit_codes: [0, 1]) do |res|
84+
fail_test unless res.stderr.include?('the target path is not trusted')
8585
end
8686
end
8787
end

‎spec/acceptance/tests/resource/ssh_authorized_key/destroy_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
"key='mykey'"]
3232
on(agent, puppet_resource('ssh_authorized_key', name.to_s, args))
3333

34-
on(agent, "cat #{auth_keys}") do |_res|
35-
expect(stdout).not_to include(name.to_s)
34+
on(agent, "cat #{auth_keys}") do |res|
35+
expect(res.stdout).not_to include(name.to_s)
3636
end
3737
end
3838

@@ -46,8 +46,8 @@
4646
"target='#{custom_key}'"]
4747
on(agent, puppet_resource('ssh_authorized_key', name.to_s, args))
4848

49-
on(agent, "cat #{custom_key}") do |_res|
50-
expect(stdout).not_to include(name.to_s)
49+
on(agent, "cat #{custom_key}") do |res|
50+
expect(res.stdout).not_to include(name.to_s)
5151
end
5252
on(agent, "rm -rf #{custom_key_directory}")
5353
end

‎spec/acceptance/tests/resource/ssh_authorized_key/modify_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
"key='mynewshinykey'"]
3030
on(agent, puppet_resource('ssh_authorized_key', name.to_s, args))
3131

32-
on(agent, "cat #{auth_keys}") do |_res|
33-
expect(stdout).to include("mynewshinykey #{name}")
34-
expect(stdout).not_to include("mykey #{name}")
32+
on(agent, "cat #{auth_keys}") do |res|
33+
expect(res.stdout).to include("mynewshinykey #{name}")
34+
expect(res.stdout).not_to include("mykey #{name}")
3535
end
3636
end
3737

@@ -45,9 +45,9 @@
4545
"target='#{custom_key}'"]
4646
on(agent, puppet_resource('ssh_authorized_key', name.to_s, args))
4747

48-
on(agent, "cat #{custom_key}") do |_res|
49-
expect(stdout).to include("mynewshinykey #{name}")
50-
expect(stdout).not_to include("mykey #{name}")
48+
on(agent, "cat #{custom_key}") do |res|
49+
expect(res.stdout).to include("mynewshinykey #{name}")
50+
expect(res.stdout).not_to include("mykey #{name}")
5151
end
5252
on(agent, "rm -rf #{custom_key_directory}")
5353
end

‎spec/acceptance/tests/resource/sshkey/create_spec.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
]
6767
on(agent, puppet_resource('sshkey', keyname.to_s, args))
6868

69-
on(agent, "cat #{ssh_known_hosts}") do |_rc|
70-
expect(stdout).to include(keyname.to_s)
69+
on(agent, "cat #{ssh_known_hosts}") do |res|
70+
expect(res.stdout).to include(keyname.to_s)
7171
end
7272
end
7373
end
@@ -98,9 +98,9 @@
9898
}
9999
MANIFEST
100100

101-
on(agent, "cat #{ssh_known_hosts}") do |_rc|
102-
expect(stdout).to include("#{keyname} ssh-rsa")
103-
expect(stdout).to include("#{keyname} ssh-dss")
101+
on(agent, "cat #{ssh_known_hosts}") do |res|
102+
expect(res.stdout).to include("#{keyname} ssh-rsa")
103+
expect(res.stdout).to include("#{keyname} ssh-dss")
104104
end
105105
end
106106
end

‎spec/acceptance/tests/resource/sshkey/destroy_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
"type='rsa'"]
5757
on(agent, puppet_resource('sshkey', keyname.to_s, args))
5858

59-
on(agent, "cat #{ssh_known_hosts}") do |_res|
60-
expect(stdout).not_to include('how_about_the_initial_rsa_key_of_c')
59+
on(agent, "cat #{ssh_known_hosts}") do |res|
60+
expect(res.stdout).not_to include('how_about_the_initial_rsa_key_of_c')
6161
end
6262
end
6363

@@ -66,8 +66,8 @@
6666
"type='ssh-dss'"]
6767
on(agent, puppet_resource('sshkey', keyname.to_s, args))
6868

69-
on(agent, "cat #{ssh_known_hosts}") do |_res|
70-
expect(stdout).not_to include('how_about_the_initial_dss_key_of_c')
69+
on(agent, "cat #{ssh_known_hosts}") do |res|
70+
expect(res.stdout).not_to include('how_about_the_initial_dss_key_of_c')
7171
end
7272
end
7373
end

‎spec/acceptance/tests/resource/sshkey/modify_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
"key='how_about_the_updated_rsa_key_of_c'"]
5858
on(agent, puppet_resource('sshkey', keyname.to_s, args))
5959

60-
on(agent, "cat #{ssh_known_hosts}") do |_res|
61-
expect(stdout).to include('how_about_the_updated_rsa_key_of_c')
62-
expect(stdout).not_to include('how_about_the_initial_rsa_key_of_c')
60+
on(agent, "cat #{ssh_known_hosts}") do |res|
61+
expect(res.stdout).to include('how_about_the_updated_rsa_key_of_c')
62+
expect(res.stdout).not_to include('how_about_the_initial_rsa_key_of_c')
6363
end
6464
end
6565

@@ -69,9 +69,9 @@
6969
"key='how_about_the_updated_dss_key_of_c'"]
7070
on(agent, puppet_resource('sshkey', keyname.to_s, args))
7171

72-
on(agent, "cat #{ssh_known_hosts}") do |_res|
73-
expect(stdout).to include('how_about_the_updated_dss_key_of_c')
74-
expect(stdout).not_to include('how_about_the_initial_dss_key_of_c')
72+
on(agent, "cat #{ssh_known_hosts}") do |res|
73+
expect(res.stdout).to include('how_about_the_updated_dss_key_of_c')
74+
expect(res.stdout).not_to include('how_about_the_initial_dss_key_of_c')
7575
end
7676
end
7777
end

‎spec/acceptance/tests/resource/sshkey/purge_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
# expect purging to be idempotent
6666
apply_manifest_on(agent, purge_manifest, catch_changes: true)
6767

68-
on(agent, "cat #{ssh_known_hosts}") do |_res|
69-
expect(stdout).not_to include('how_about_the_initial')
68+
on(agent, "cat #{ssh_known_hosts}") do |res|
69+
expect(res.stdout).not_to include('how_about_the_initial')
7070
end
7171
end
7272
end

‎spec/spec_helper_acceptance.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
require 'beaker-rspec'
2+
require 'beaker-puppet'
23
require 'beaker/module_install_helper'
34
require 'beaker/puppet_install_helper'
45
require 'voxpupuli/acceptance/spec_helper_acceptance'
@@ -18,6 +19,7 @@ def osx_agents
1819
RSpec.configure do |c|
1920
c.before :suite do
2021
unless ENV['BEAKER_provision'] == 'no'
22+
hosts.each { |host| host[:type] = 'aio' }
2123
run_puppet_install_helper
2224
install_module_on(hosts)
2325
install_module_dependencies_on(hosts)

0 commit comments

Comments
 (0)