Skip to content

Commit 66e0c92

Browse files
committed
Update beaker tests
1 parent f7d6f37 commit 66e0c92

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

spec/acceptance/ntp_config_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
line = '0.gentoo.pool.ntp.org'
2020
end
2121
when 'Solaris'
22-
line = '0.solaris.pool.ntp.org'
22+
line = '0.pool.ntp.org'
2323
when 'AIX'
2424
line = '0.debian.pool.ntp.org iburst'
2525
end

spec/acceptance/ntp_install_spec.rb

+5-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
when 'AIX'
1616
packagename = 'bos.net.tcp.client'
1717
when 'Solaris'
18-
packagename = 'SUNWntpr'
18+
packagename = ['SUNWntpr','SUNWntpu']
1919
else
2020
packagename = 'ntp'
2121
end
@@ -27,7 +27,9 @@ class { 'ntp': }
2727
}, :catch_failures => true)
2828
end
2929

30-
describe package(packagename) do
31-
it { should be_installed }
30+
Array(packagename).each do |package|
31+
describe package(package) do
32+
it { should be_installed }
33+
end
3234
end
3335
end

spec/acceptance/ntp_parameters_spec.rb

+7-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
when 'AIX'
1616
packagename = 'bos.net.tcp.client'
1717
when 'Solaris'
18-
packagename = 'SUNWntpr'
18+
packagename = ['SUNWntpr','SUNWntpu']
1919
else
2020
packagename = 'ntp'
2121
end
@@ -109,15 +109,18 @@ class { 'ntp':
109109
describe 'package' do
110110
it 'installs the right package' do
111111
pp = <<-EOS
112-
class { ['#{packagename}']:
112+
class { 'ntp':
113113
package_ensure => present,
114+
package_name => #{Array(packagename).inspect},
114115
}
115116
EOS
116117
apply_manifest(pp, :catch_failures => true)
117118
end
118119

119-
describe package(packagename) do
120-
it { should be_installed }
120+
Array(packagename).each do |package|
121+
describe package(package) do
122+
it { should be_installed }
123+
end
121124
end
122125
end
123126

0 commit comments

Comments
 (0)