Add os_service_default fact for tests
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:
parent
9bdabc182d
commit
9823bd1d51
@ -22,11 +22,11 @@ describe 'openstack_extras::repo::debian::debian' do
|
|||||||
|
|
||||||
context 'on Debian platforms' do
|
context 'on Debian platforms' do
|
||||||
let :facts do
|
let :facts do
|
||||||
{
|
@default_facts.merge({
|
||||||
:osfamily => 'Debian',
|
:osfamily => 'Debian',
|
||||||
:operatingsystem => 'Debian',
|
:operatingsystem => 'Debian',
|
||||||
:lsbdistid => 'Debian'
|
:lsbdistid => 'Debian'
|
||||||
}
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'with default parameters' do
|
describe 'with default parameters' do
|
||||||
|
@ -22,12 +22,12 @@ describe 'openstack_extras::repo::debian::ubuntu' do
|
|||||||
|
|
||||||
context 'on Debian platforms' do
|
context 'on Debian platforms' do
|
||||||
let :facts do
|
let :facts do
|
||||||
{
|
@default_facts.merge({
|
||||||
:osfamily => 'Debian',
|
:osfamily => 'Debian',
|
||||||
:operatingsystem => 'Ubuntu',
|
:operatingsystem => 'Ubuntu',
|
||||||
:lsbdistid => 'Ubuntu',
|
:lsbdistid => 'Ubuntu',
|
||||||
:lsbdistcodename => 'trusty'
|
:lsbdistcodename => 'trusty'
|
||||||
}
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'with default parameters' do
|
describe 'with default parameters' do
|
||||||
|
@ -35,13 +35,13 @@ describe 'openstack_extras::repo::redhat::redhat' do
|
|||||||
|
|
||||||
context 'on RedHat platforms' do
|
context 'on RedHat platforms' do
|
||||||
let :facts do
|
let :facts do
|
||||||
{
|
@default_facts.merge({
|
||||||
:osfamily => 'RedHat',
|
:osfamily => 'RedHat',
|
||||||
:operatingsystem => 'RedHat',
|
:operatingsystem => 'RedHat',
|
||||||
:operatingsystemrelease => '7.1',
|
:operatingsystemrelease => '7.1',
|
||||||
:operatingsystemmajrelease => '7',
|
:operatingsystemmajrelease => '7',
|
||||||
:puppetversion => Puppet.version,
|
:puppetversion => Puppet.version,
|
||||||
}
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'with default parameters' do
|
describe 'with default parameters' do
|
||||||
|
@ -9,9 +9,10 @@ describe 'openstack_extras::pacemaker::service', :type => :define do
|
|||||||
end
|
end
|
||||||
|
|
||||||
let :facts do
|
let :facts do
|
||||||
{ :osfamily => 'Debian',
|
@default_facts.merge({
|
||||||
|
:osfamily => 'Debian',
|
||||||
:operatingsystem => 'Debian'
|
:operatingsystem => 'Debian'
|
||||||
}
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
let (:title) { 'glance-registry' }
|
let (:title) { 'glance-registry' }
|
||||||
|
@ -5,6 +5,9 @@ require 'webmock/rspec'
|
|||||||
RSpec.configure do |c|
|
RSpec.configure do |c|
|
||||||
c.alias_it_should_behave_like_to :it_configures, 'configures'
|
c.alias_it_should_behave_like_to :it_configures, 'configures'
|
||||||
c.alias_it_should_behave_like_to :it_raises, 'raises'
|
c.alias_it_should_behave_like_to :it_raises, 'raises'
|
||||||
|
c.before :each do
|
||||||
|
@default_facts = { :os_service_default => '<SERVICE DEFAULT>' }
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
at_exit { RSpec::Puppet::Coverage.report! }
|
at_exit { RSpec::Puppet::Coverage.report! }
|
||||||
|
Loading…
x
Reference in New Issue
Block a user