Skip to content

Commit 98821c2

Browse files
committed
Merge pull request #227 from kbarber/ticket/master/pdb-2637-provide-static-facts-to-fix-rspec-tests
(PDB-2637) Add static facts for selinux and iptables to fix rspec tests
2 parents 0b2d0ed + 298c44c commit 98821c2

4 files changed

Lines changed: 10 additions & 0 deletions

File tree

spec/unit/classes/init_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
:lsbdistcodename => 'foo',
1616
:id => 'root',
1717
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
18+
:selinux => false,
19+
:iptables_persistent_version => '0.5.7',
1820
}
1921
end
2022

@@ -31,6 +33,8 @@
3133
:operatingsystemrelease => '6.0',
3234
:kernel => 'Linux',
3335
:concat_basedir => '/var/lib/puppet/concat',
36+
:selinux => true,
37+
:iptables_persistent_version => '0.5.7',
3438
}
3539
end
3640
ttl_args.each do |ttl_arg|

spec/unit/classes/master/config_spec.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
:concat_basedir => '/var/lib/puppet/concat',
1515
:id => 'root',
1616
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
17+
:selinux => true,
18+
:iptables_persistent_version => '0.5.7',
1719
}
1820
end
1921

@@ -82,6 +84,7 @@
8284
:operatingsystemrelease => '7.0',
8385
:kernel => 'Linux',
8486
:concat_basedir => '/var/lib/puppet/concat',
87+
:selinux => true,
8588
}
8689
end
8790
let (:pre_condition) { 'class { "puppetdb::globals": version => "3.1.1-1.el7", }' }

spec/unit/classes/master/puppetdb_conf_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
:concat_basedir => '/var/lib/puppet/concat',
1515
:id => 'root',
1616
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
17+
:selinux => false,
18+
:iptables_persistent_version => '0.5.7',
1719
}
1820
end
1921

spec/unit/classes/server_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
:operatingsystemrelease => '6.5',
99
:fqdn => 'test.domain.local',
1010
:kernel => 'Linux',
11+
:selinux => true,
1112
}
1213

1314
context 'on a supported platform' do

0 commit comments

Comments
 (0)