Skip to content

Commit 8e1edf3

Browse files
AriaXLiAriaXLi
committed
(maint) Update spec tests after making changes to pass checks
1 parent 58a2299 commit 8e1edf3

7 files changed

+33
-33
lines changed

‎spec/classes/puppet_agent_osfamily_aix_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
shared_examples 'aix' do |aixver, pkg_aixver, powerver|
2525
let(:rpmname) { "puppet-agent-#{params[:package_version]}-1.aix#{pkg_aixver}.ppc.rpm" }
2626
let(:tag) { "aix-#{pkg_aixver}-power" }
27-
let(:source) { "puppet:///pe_packages/2000.0.0/#{tag}/#{rpmname}" }
27+
let(:source) { "puppet:///modules/pe_packages/2000.0.0/#{tag}/#{rpmname}" }
2828
let(:facts) do
2929
common_facts.merge({
3030
architecture: "PowerPC_POWER#{powerver}",

‎spec/classes/puppet_agent_osfamily_darwin_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
override_facts(facts, aio_agent_version: '1.10.99', is_pe: true, os: { macosx: { version: { major: '10.13', }, }, }, platform_tag: 'osx-10.13-x86_64', serverversion: '5.10.200')
9595
end
9696

97-
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx10.13.dmg').with_source('puppet:///pe_packages/2000.0.0/osx-10.13-x86_64/puppet-agent-5.10.200-1.osx10.13.dmg') }
97+
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx10.13.dmg').with_source('puppet:///modules/pe_packages/2000.0.0/osx-10.13-x86_64/puppet-agent-5.10.200-1.osx10.13.dmg') }
9898
end
9999

100100
describe 'when using package_version auto with macOS 11 (two numbers version productversion)' do
@@ -107,7 +107,7 @@
107107
override_facts(facts, aio_agent_version: '1.10.99', is_pe: true, os: { macosx: { version: { major: '11.2', }, }, }, platform_tag: 'osx-11-x86_64', serverversion: '5.10.200')
108108
end
109109

110-
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx11.dmg').with_source('puppet:///pe_packages/2000.0.0/osx-11-x86_64/puppet-agent-5.10.200-1.osx11.dmg') }
110+
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx11.dmg').with_source('puppet:///modules/pe_packages/2000.0.0/osx-11-x86_64/puppet-agent-5.10.200-1.osx11.dmg') }
111111
end
112112

113113
describe 'when using package_version auto with macOS 11 (one number version productversion)' do
@@ -120,6 +120,6 @@
120120
override_facts(facts, aio_agent_version: '1.10.99', is_pe: true, os: { macosx: { version: { major: '11', }, }, }, platform_tag: 'osx-11-x86_64', serverversion: '5.10.200')
121121
end
122122

123-
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx11.dmg').with_source('puppet:///pe_packages/2000.0.0/osx-11-x86_64/puppet-agent-5.10.200-1.osx11.dmg') }
123+
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx11.dmg').with_source('puppet:///modules/pe_packages/2000.0.0/osx-11-x86_64/puppet-agent-5.10.200-1.osx11.dmg') }
124124
end
125125
end

‎spec/classes/puppet_agent_osfamily_debian_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
it {
155155
is_expected.to contain_file('/etc/pki/deb-gpg/GPG-KEY-puppet-20250406')
156156
.with({
157-
'ensure' => 'present',
157+
'ensure' => 'file',
158158
'owner' => '0',
159159
'group' => '0',
160160
'mode' => '0644',
@@ -165,7 +165,7 @@
165165
it {
166166
is_expected.to contain_file('/etc/pki/deb-gpg/GPG-KEY-puppet')
167167
.with({
168-
'ensure' => 'present',
168+
'ensure' => 'file',
169169
'owner' => '0',
170170
'group' => '0',
171171
'mode' => '0644',

‎spec/classes/puppet_agent_osfamily_redhat_spec.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
end
8484

8585
context 'with manage_pki_dir => false' do
86-
let(:params) { { manage_pki_dir: 'false' } }
86+
let(:params) { { manage_pki_dir: false } }
8787

8888
['/etc/pki', '/etc/pki/rpm-gpg'].each do |path|
8989
it { is_expected.not_to contain_file(path) }
@@ -93,7 +93,7 @@
9393
it {
9494
is_expected.to contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-puppet-20250406')
9595
.with({
96-
'ensure' => 'present',
96+
'ensure' => 'file',
9797
'owner' => '0',
9898
'group' => '0',
9999
'mode' => '0644',
@@ -104,7 +104,7 @@
104104
it {
105105
is_expected.to contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-puppet')
106106
.with({
107-
'ensure' => 'present',
107+
'ensure' => 'file',
108108
'owner' => '0',
109109
'group' => '0',
110110
'mode' => '0644',
@@ -240,7 +240,7 @@
240240
{
241241
manage_repo: true,
242242
package_version: package_version,
243-
skip_if_unavailable: true,
243+
skip_if_unavailable: 'true',
244244
}
245245
end
246246

@@ -293,7 +293,7 @@
293293
it {
294294
is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-6.12.0.rpm')
295295
.with('path' => '/opt/puppetlabs/packages/puppet-agent-6.12.0.rpm')
296-
.with('ensure' => 'present')
296+
.with('ensure' => 'file')
297297
.with('owner' => '0')
298298
.with('group' => '0')
299299
.with('mode' => '0644')

‎spec/classes/puppet_agent_osfamily_solaris_spec.rb

+12-12
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def install_script(ver, arch)
119119
it do
120120
is_expected.to contain_file("/opt/puppetlabs/packages/puppet-agent@#{sol11_package_version},5.11-1.i386.p5p")
121121
.with({
122-
'ensure' => 'present',
122+
'ensure' => 'file',
123123
'source' => "http://fake-solaris-source.com/packages/2000.0.0/solaris-11-i386/puppet-agent@#{sol11_package_version},5.11-1.i386.p5p",
124124
})
125125
end
@@ -137,8 +137,8 @@ def install_script(ver, arch)
137137
it do
138138
is_expected.to contain_file("/opt/puppetlabs/packages/puppet-agent@#{sol11_package_version},5.11-1.i386.p5p")
139139
.with({
140-
'ensure' => 'present',
141-
'source' => "puppet:///pe_packages/#{pe_version}/solaris-11-i386/puppet-agent@#{sol11_package_version},5.11-1.i386.p5p",
140+
'ensure' => 'file',
141+
'source' => "puppet:///modules/pe_packages/#{pe_version}/solaris-11-i386/puppet-agent@#{sol11_package_version},5.11-1.i386.p5p",
142142
})
143143
end
144144

@@ -193,8 +193,8 @@ def install_script(ver, arch)
193193
it do
194194
is_expected.to contain_file("/opt/puppetlabs/packages/puppet-agent@#{sol11_package_version},5.11-1.sparc.p5p")
195195
.with({
196-
'ensure' => 'present',
197-
'source' => "puppet:///pe_packages/#{pe_version}/solaris-11-sparc/puppet-agent@#{sol11_package_version},5.11-1.sparc.p5p",
196+
'ensure' => 'file',
197+
'source' => "puppet:///modules/pe_packages/#{pe_version}/solaris-11-sparc/puppet-agent@#{sol11_package_version},5.11-1.sparc.p5p",
198198
})
199199
end
200200

@@ -252,7 +252,7 @@ def install_script(ver, arch)
252252
it do
253253
is_expected.to contain_file("/opt/puppetlabs/packages/puppet-agent-#{package_version}-1.i386.pkg.gz")
254254
.with({
255-
'ensure' => 'present',
255+
'ensure' => 'file',
256256
'source' => "http://fake-solaris-source.com/packages/2000.0.0/solaris-10-i386/puppet-agent-#{package_version}-1.i386.pkg.gz",
257257
})
258258
end
@@ -270,12 +270,12 @@ def install_script(ver, arch)
270270
it do
271271
is_expected.to contain_file("/opt/puppetlabs/packages/puppet-agent-#{package_version}-1.i386.pkg.gz")
272272
.with({
273-
'ensure' => 'present',
274-
'source' => "puppet:///pe_packages/#{pe_version}/solaris-10-i386/puppet-agent-#{package_version}-1.i386.pkg.gz"
273+
'ensure' => 'file',
274+
'source' => "puppet:///modules/pe_packages/#{pe_version}/solaris-10-i386/puppet-agent-#{package_version}-1.i386.pkg.gz"
275275
})
276276
end
277277

278-
it { is_expected.to contain_file('/opt/puppetlabs/packages/solaris-noask').with_source("puppet:///pe_packages/#{pe_version}/solaris-10-i386/solaris-noask") }
278+
it { is_expected.to contain_file('/opt/puppetlabs/packages/solaris-noask').with_source("puppet:///modules/pe_packages/#{pe_version}/solaris-10-i386/solaris-noask") }
279279
it do
280280
is_expected.to contain_exec("unzip puppet-agent-#{package_version}-1.i386.pkg.gz").with_command("gzip -d /opt/puppetlabs/packages/puppet-agent-#{package_version}-1.i386.pkg.gz")
281281
is_expected.to contain_exec("unzip puppet-agent-#{package_version}-1.i386.pkg.gz").with_creates("/opt/puppetlabs/packages/puppet-agent-#{package_version}-1.i386.pkg")
@@ -318,12 +318,12 @@ def install_script(ver, arch)
318318
it do
319319
is_expected.to contain_file("/opt/puppetlabs/packages/puppet-agent-#{package_version}-1.sparc.pkg.gz")
320320
.with({
321-
'ensure' => 'present',
322-
'source' => "puppet:///pe_packages/#{pe_version}/solaris-10-sparc/puppet-agent-#{package_version}-1.sparc.pkg.gz"
321+
'ensure' => 'file',
322+
'source' => "puppet:///modules/pe_packages/#{pe_version}/solaris-10-sparc/puppet-agent-#{package_version}-1.sparc.pkg.gz"
323323
})
324324
end
325325

326-
it { is_expected.to contain_file('/opt/puppetlabs/packages/solaris-noask').with_source("puppet:///pe_packages/#{pe_version}/solaris-10-sparc/solaris-noask") }
326+
it { is_expected.to contain_file('/opt/puppetlabs/packages/solaris-noask').with_source("puppet:///modules/pe_packages/#{pe_version}/solaris-10-sparc/solaris-noask") }
327327
it do
328328
is_expected.to contain_exec("unzip puppet-agent-#{package_version}-1.sparc.pkg.gz").with_command("gzip -d /opt/puppetlabs/packages/puppet-agent-#{package_version}-1.sparc.pkg.gz")
329329
is_expected.to contain_exec("unzip puppet-agent-#{package_version}-1.sparc.pkg.gz").with_creates("/opt/puppetlabs/packages/puppet-agent-#{package_version}-1.sparc.pkg")

‎spec/classes/puppet_agent_osfamily_suse_spec.rb

+7-7
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
end
106106

107107
context 'with manage_pki_dir => false' do
108-
let(:params) { { manage_pki_dir: 'false' } }
108+
let(:params) { { manage_pki_dir: false } }
109109

110110
['/etc/pki', '/etc/pki/rpm-gpg'].each do |path|
111111
it { is_expected.not_to contain_file(path) }
@@ -117,7 +117,7 @@
117117
it {
118118
is_expected.to contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-puppet-20250406')
119119
.with({
120-
'ensure' => 'present',
120+
'ensure' => 'file',
121121
'owner' => '0',
122122
'group' => '0',
123123
'mode' => '0644',
@@ -128,7 +128,7 @@
128128
it {
129129
is_expected.to contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-puppet')
130130
.with({
131-
'ensure' => 'present',
131+
'ensure' => 'file',
132132
'owner' => '0',
133133
'group' => '0',
134134
'mode' => '0644',
@@ -244,7 +244,7 @@
244244
end
245245

246246
context 'with manage_pki_dir => false' do
247-
let(:params) { { manage_pki_dir: 'false' } }
247+
let(:params) { { manage_pki_dir: false } }
248248

249249
['/etc/pki', '/etc/pki/rpm-gpg'].each do |path|
250250
it { is_expected.not_to contain_file(path) }
@@ -256,7 +256,7 @@
256256
it {
257257
is_expected.to contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-puppet-20250406')
258258
.with({
259-
'ensure' => 'present',
259+
'ensure' => 'file',
260260
'owner' => '0',
261261
'group' => '0',
262262
'mode' => '0644',
@@ -267,7 +267,7 @@
267267
it {
268268
is_expected.to contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-puppet')
269269
.with({
270-
'ensure' => 'present',
270+
'ensure' => 'file',
271271
'owner' => '0',
272272
'group' => '0',
273273
'mode' => '0644',
@@ -373,7 +373,7 @@
373373
it {
374374
is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-1.10.100-1.sles11.x86_64.rpm')
375375
.with(
376-
source: 'puppet:///pe_packages/2000.0.0/sles-11-x86_64/puppet-agent-1.10.100-1.sles11.x86_64.rpm',
376+
source: 'puppet:///modules/pe_packages/2000.0.0/sles-11-x86_64/puppet-agent-1.10.100-1.sles11.x86_64.rpm',
377377
)
378378
}
379379
it {

‎spec/classes/puppet_agent_osfamily_windows_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
it { is_expected.to contain_file("#{appdata}\\Puppetlabs\\packages") }
5454
it {
5555
is_expected.to contain_file("#{appdata}\\Puppetlabs\\packages\\puppet-agent-#{arch}.msi").with(
56-
'source' => "puppet:///pe_packages/#{pe_version}/windows-#{tag}/puppet-agent-#{arch}.msi",
56+
'source' => "puppet:///modules/pe_packages/#{pe_version}/windows-#{tag}/puppet-agent-#{arch}.msi",
5757
)
5858
}
5959
end
@@ -91,7 +91,7 @@
9191
it { is_expected.to contain_file("#{appdata}\\Puppetlabs\\packages") }
9292
it {
9393
is_expected.to contain_file("#{appdata}\\Puppetlabs\\packages\\puppet-agent-#{arch}.msi").with(
94-
'source' => "puppet:///pe_packages/#{pe_version}/windows-#{tag}/puppet-agent-#{arch}.msi",
94+
'source' => "puppet:///modules/pe_packages/#{pe_version}/windows-#{tag}/puppet-agent-#{arch}.msi",
9595
)
9696
}
9797
end
@@ -131,7 +131,7 @@
131131
it { is_expected.to contain_file("#{appdata}\\Puppetlabs\\packages") }
132132
it do
133133
is_expected.to contain_file("#{appdata}\\Puppetlabs\\packages\\puppet-agent-#{arch}.msi").with(
134-
'source' => "puppet:///pe_packages/#{pe_version}/windowsfips-#{tag}/puppet-agent-#{arch}.msi",
134+
'source' => "puppet:///modules/pe_packages/#{pe_version}/windowsfips-#{tag}/puppet-agent-#{arch}.msi",
135135
)
136136
end
137137
end

0 commit comments

Comments
 (0)