Skip to content

Commit d89062f

Browse files
committed
(FM-4563) skip idempotency tests on test cells that do have PUP-5016 unfixed
Arguably this decision should be extracted to a more central place, like puppetlabs_spec_helper or the CI config.
1 parent 2de4597 commit d89062f

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

spec/spec_helper_acceptance.rb

+7-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
# Readable test descriptions
1313
c.formatter = :documentation
1414

15+
# detect the situation where PUP-5016 is triggered and skip the idempotency tests in that case
16+
# also note how fact('puppetversion') is not available because of PUP-4359
17+
if fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') == '8' && shell('puppet --version').stdout =~ /^4\.2/
18+
c.filter_run_excluding :skip_pup_5016 => true
19+
end
20+
1521
# Configure all nodes in nodeset
1622
c.before :suite do
1723
# Install module and dependencies
@@ -53,7 +59,7 @@
5359
apply_manifest(pp, :catch_failures => true)
5460
end
5561

56-
it 'should apply a second time without changes' do
62+
it 'should apply a second time without changes', :skip_pup_5016 do
5763
apply_manifest(pp, :catch_changes => true)
5864
end
5965
end

0 commit comments

Comments
 (0)