openstack/puppet-openstack_extras
Code Issues Proposed changes

Add os_service_default fact for tests

Browse Source 
This change adds the os_service_default for tests as they are currently
failing due to a pick() failing because os_service_default is not
defined as a fact.

Change-Id: Ib095e946a964e29e7fb624ca6e6dd24477787a1e
This commit is contained in:
Alex Schultz 2016-01-08 16:20:23 -07:00
parent 9bdabc182d
commit 9823bd1d51
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec/classes/openstack_extras_repo_debian_debian_spec.rb
View File

@ -22,11 +22,11 @@ describe 'openstack_extras::repo::debian::debian' do
context 'on Debian platforms' do
let :facts do
{
@default_facts.merge({
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:lsbdistid => 'Debian'
}
})
end
describe 'with default parameters' do

4
spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
View File

@ -22,12 +22,12 @@ describe 'openstack_extras::repo::debian::ubuntu' do
context 'on Debian platforms' do
let :facts do
{
@default_facts.merge({
:osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
:lsbdistid => 'Ubuntu',
:lsbdistcodename => 'trusty'
}
})
end
describe 'with default parameters' do

4
spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
View File

@ -35,13 +35,13 @@ describe 'openstack_extras::repo::redhat::redhat' do
context 'on RedHat platforms' do
let :facts do
{
@default_facts.merge({
:osfamily => 'RedHat',
:operatingsystem => 'RedHat',
:operatingsystemrelease => '7.1',
:operatingsystemmajrelease => '7',
:puppetversion => Puppet.version,
}
})
end
describe 'with default parameters' do

5
spec/defines/openstack_extras_pacemaker_service_spec.rb
View File

@ -9,9 +9,10 @@ describe 'openstack_extras::pacemaker::service', :type => :define do
end
let :facts do
{ :osfamily => 'Debian',
@default_facts.merge({
:osfamily => 'Debian',
:operatingsystem => 'Debian'
}
})
end
let (:title) { 'glance-registry' }

3
spec/spec_helper.rb
View File

@ -5,6 +5,9 @@ require 'webmock/rspec'
RSpec.configure do |c|
c.alias_it_should_behave_like_to :it_configures, 'configures'
c.alias_it_should_behave_like_to :it_raises, 'raises'
c.before :each do
@default_facts = { :os_service_default => '<SERVICE DEFAULT>' }
end
end
at_exit { RSpec::Puppet::Coverage.report! }