openstack/puppet-nova
Code Issues Proposed changes

Fix rspec 3.x syntax

Browse Source 
- Convert 'should' keyword to 'is_expected.to'
- The old ':should' syntax in rspec 3.x is deprecated in favor of
  ':expect' syntax.

Change-Id: Ib621ab180d3c76e0afafd4b06d264cad11e600de
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
This commit is contained in:
Gael Chamoulaud 2015-07-19 21:21:11 +02:00
parent 895e057abb
commit ce641f2689
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/acceptance/basic_nova_spec.rb
View File

@ -136,7 +136,7 @@ describe 'basic nova' do
end
describe cron do
it { should have_entry('1 0 * * * nova-manage db archive_deleted_rows --max_rows 100 >>/var/log/nova/nova-rowsflush.log 2>&1').with_user('nova') }
it { is_expected.to have_entry('1 0 * * * nova-manage db archive_deleted_rows --max_rows 100 >>/var/log/nova/nova-rowsflush.log 2>&1').with_user('nova') }
end
end

8
spec/classes/nova_compute_rbd_spec.rb
View File

@ -116,10 +116,10 @@ describe 'nova::compute::rbd' do
end
it 'should only set user and secret_uuid in nova.conf ' do
should_not contain_nova_config('libvirt/images_rbd_pool').with_value('rbd')
should_not contain_nova_config('libvirt/images_rbd_ceph_conf').with_value('/etc/ceph/ceph.conf')
should contain_nova_config('libvirt/rbd_user').with_value('nova')
should contain_nova_config('libvirt/rbd_secret_uuid').with_value('UUID')
is_expected.to_not contain_nova_config('libvirt/images_rbd_pool').with_value('rbd')
is_expected.to_not contain_nova_config('libvirt/images_rbd_ceph_conf').with_value('/etc/ceph/ceph.conf')
is_expected.to contain_nova_config('libvirt/rbd_user').with_value('nova')
is_expected.to contain_nova_config('libvirt/rbd_secret_uuid').with_value('UUID')
end
it 'configure ceph on compute nodes' do

2
spec/type/nova_aggregate_spec.rb
View File

@ -16,7 +16,7 @@ describe Puppet::Type.type(:nova_aggregate) do
end
it "should be able to create an instance" do
described_class.new(:name => 'agg0').should_not be_nil
expect(described_class.new(:name => 'agg0')).not_to be_nil
end
it "should be able to create an more complex instance" do