From 9823bd1d51c0d188e41fc02c1862c8a22dcb408d Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 8 Jan 2016 16:20:23 -0700 Subject: [PATCH] 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 --- spec/classes/openstack_extras_repo_debian_debian_spec.rb | 4 ++-- spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb | 4 ++-- spec/classes/openstack_extras_repo_redhat_redhat_spec.rb | 4 ++-- spec/defines/openstack_extras_pacemaker_service_spec.rb | 5 +++-- spec/spec_helper.rb | 3 +++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/spec/classes/openstack_extras_repo_debian_debian_spec.rb b/spec/classes/openstack_extras_repo_debian_debian_spec.rb index a3d6e3a..43d95b6 100644 --- a/spec/classes/openstack_extras_repo_debian_debian_spec.rb +++ b/spec/classes/openstack_extras_repo_debian_debian_spec.rb @@ -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 diff --git a/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb b/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb index bf7f6ed..527f250 100644 --- a/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb +++ b/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb @@ -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 diff --git a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb index f6dbecc..c7f56e9 100644 --- a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb +++ b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb @@ -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 diff --git a/spec/defines/openstack_extras_pacemaker_service_spec.rb b/spec/defines/openstack_extras_pacemaker_service_spec.rb index 4dfc325..d82cccc 100644 --- a/spec/defines/openstack_extras_pacemaker_service_spec.rb +++ b/spec/defines/openstack_extras_pacemaker_service_spec.rb @@ -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' } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3df4ced..9bc7bcf 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -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 => '' } + end end at_exit { RSpec::Puppet::Coverage.report! }