openstack/puppet-glance
Code Issues Proposed changes

Merge "Fix spec tests for RSpec 3.x and Puppet 4.x"

Browse Source
This commit is contained in:
Jenkins
2015-04-28 19:44:01 +00:00
committed by Gerrit Code Review
parent 1d38834466 60de7b77df
commit 0db42a6a60
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/classes/glance_keystone_auth_spec.rb
View File

@@ -15,7 +15,7 @@ describe 'glance::keystone::auth' do
it { is_expected.to contain_keystone_user_role('glance@services').with( it { is_expected.to contain_keystone_user_role('glance@services').with(
:ensure => 'present', :ensure => 'present',
:roles => 'admin' :roles => ['admin']
) } ) }
it { is_expected.to contain_keystone_service('glance').with( it { is_expected.to contain_keystone_service('glance').with(
@@ -50,7 +50,7 @@ describe 'glance::keystone::auth' do
it { is_expected.to contain_keystone_user_role('glancey@services').with( it { is_expected.to contain_keystone_user_role('glancey@services').with(
:ensure => 'present', :ensure => 'present',
:roles => 'admin' :roles => ['admin']
) } ) }
it { is_expected.to contain_keystone_service('glancey').with( it { is_expected.to contain_keystone_service('glancey').with(
@@ -153,7 +153,7 @@ describe 'glance::keystone::auth' do
} }
end end
it { is_expected.to contain_keystone_endpoint('RegionOne/glance').with_notify('Service[glance-api]') } it { is_expected.to contain_keystone_endpoint('RegionOne/glance').with_notify(["Service[glance-api]"]) }
end end
describe 'when overriding service name' do describe 'when overriding service name' do

2
spec/classes/glance_registry_spec.rb
View File

@@ -83,7 +83,7 @@ describe 'glance::registry' do
'refreshonly' => true, 'refreshonly' => true,
'logoutput' => 'on_failure', 'logoutput' => 'on_failure',
'subscribe' => ['Package[glance-registry]', 'File[/etc/glance/glance-registry.conf]'], 'subscribe' => ['Package[glance-registry]', 'File[/etc/glance/glance-registry.conf]'],
'notify' => 'Service[glance-registry]' 'notify' => ["Service[glance-registry]"]
) )
end end
end end