Using contain_class instead of include_class

Per rspec-puppet-1.0.1 warning:

DEPRECATION: include_class is deprecated. Use contain_class instead.
Called from .../vendor/gems/rspec-puppet-1.0.1/lib/rspec-puppet/
matchers/include_class.rb:7

Change-Id: I6bc63343597f1b574f9da5beaae187dcc2b3485d
This commit is contained in:
Doug Schaapveld
2013-12-16 11:43:20 -06:00
parent 2ccd0b77eb
commit 691e8d7552
13 changed files with 13 additions and 13 deletions

View File

@@ -28,7 +28,7 @@ describe 'neutron::agents::dhcp' do
default_params.merge(params) default_params.merge(params)
end end
it { should include_class('neutron::params') } it { should contain_class('neutron::params') }
it_configures 'dnsmasq dhcp_driver' it_configures 'dnsmasq dhcp_driver'

View File

@@ -32,7 +32,7 @@ describe 'neutron::agents::l3' do
default_params.merge(params) default_params.merge(params)
end end
it { should include_class('neutron::params') } it { should contain_class('neutron::params') }
it 'configures l3_agent.ini' do it 'configures l3_agent.ini' do
should contain_neutron_l3_agent_config('DEFAULT/debug').with_value(p[:debug]) should contain_neutron_l3_agent_config('DEFAULT/debug').with_value(p[:debug])

View File

@@ -27,7 +27,7 @@ describe 'neutron::agents::lbaas' do
default_params.merge(params) default_params.merge(params)
end end
it { should include_class('neutron::params') } it { should contain_class('neutron::params') }
it_configures 'haproxy lbaas_driver' it_configures 'haproxy lbaas_driver'

View File

@@ -17,7 +17,7 @@ describe 'neutron::agents::linuxbridge' do
shared_examples_for 'neutron linuxbridge agent' do shared_examples_for 'neutron linuxbridge agent' do
it { should include_class('neutron::params') } it { should contain_class('neutron::params') }
it 'configures neutron linuxbridge agent service' do it 'configures neutron linuxbridge agent service' do
should contain_service('neutron-plugin-linuxbridge-service').with( should contain_service('neutron-plugin-linuxbridge-service').with(

View File

@@ -23,7 +23,7 @@ describe 'neutron::agents::metadata' do
shared_examples_for 'neutron metadata agent' do shared_examples_for 'neutron metadata agent' do
it { should include_class('neutron::params') } it { should contain_class('neutron::params') }
it 'configures neutron metadata agent service' do it 'configures neutron metadata agent service' do
should contain_service('neutron-metadata').with( should contain_service('neutron-metadata').with(

View File

@@ -49,7 +49,7 @@ describe 'neutron::agents::metering' do
default_params.merge(params) default_params.merge(params)
end end
it { should include_class('neutron::params') } it { should contain_class('neutron::params') }
it 'configures metering_agent.ini' do it 'configures metering_agent.ini' do
should contain_neutron_metering_agent_config('DEFAULT/debug').with_value(p[:debug]); should contain_neutron_metering_agent_config('DEFAULT/debug').with_value(p[:debug]);

View File

@@ -29,7 +29,7 @@ describe 'neutron::agents::ovs' do
default_params.merge(params) default_params.merge(params)
end end
it { should include_class('neutron::params') } it { should contain_class('neutron::params') }
it 'configures ovs_neutron_plugin.ini' do it 'configures ovs_neutron_plugin.ini' do
should contain_neutron_plugin_ovs('AGENT/polling_interval').with_value(p[:polling_interval]) should contain_neutron_plugin_ovs('AGENT/polling_interval').with_value(p[:polling_interval])

View File

@@ -44,7 +44,7 @@ describe 'neutron::agents::vpnaas' do
default_params.merge(params) default_params.merge(params)
end end
it { should include_class('neutron::params') } it { should contain_class('neutron::params') }
it_configures 'openswan vpnaas_driver' it_configures 'openswan vpnaas_driver'

View File

@@ -50,7 +50,7 @@ describe 'neutron' do
shared_examples_for 'a neutron base installation' do shared_examples_for 'a neutron base installation' do
it { should include_class('neutron::params') } it { should contain_class('neutron::params') }
it 'configures neutron configuration folder' do it 'configures neutron configuration folder' do
should contain_file('/etc/neutron/').with( should contain_file('/etc/neutron/').with(

View File

@@ -16,7 +16,7 @@ describe 'neutron::plugins::linuxbridge' do
shared_examples_for 'neutron linuxbridge plugin' do shared_examples_for 'neutron linuxbridge plugin' do
it { should include_class('neutron::params') } it { should contain_class('neutron::params') }
it 'installs neutron linuxbridge plugin package' do it 'installs neutron linuxbridge plugin package' do
should contain_package('neutron-plugin-linuxbridge').with( should contain_package('neutron-plugin-linuxbridge').with(

View File

@@ -48,7 +48,7 @@ describe 'neutron::plugins::ml2' do
default_params.merge(params) default_params.merge(params)
end end
it { should include_class('neutron::params') } it { should contain_class('neutron::params') }
it 'configure neutron.conf' do it 'configure neutron.conf' do
should contain_neutron_config('DEFAULT/core_plugin').with_value('neutron.plugins.ml2.plugin.Ml2Plugin') should contain_neutron_config('DEFAULT/core_plugin').with_value('neutron.plugins.ml2.plugin.Ml2Plugin')

View File

@@ -37,7 +37,7 @@ describe 'neutron::plugins::ovs' do
:name => platform_params[:ovs_server_package], :name => platform_params[:ovs_server_package],
:ensure => params[:package_ensure] :ensure => params[:package_ensure]
) )
should_not include_class('vswitch::ovs') should_not contain_class('vswitch::ovs')
end end
context 'with vlan mode' do context 'with vlan mode' do

View File

@@ -43,7 +43,7 @@ describe 'neutron::server' do
should contain_neutron_config('database/retry_interval').with_value(p[:retry_interval]) should contain_neutron_config('database/retry_interval').with_value(p[:retry_interval])
end end
it { should include_class('neutron::params') } it { should contain_class('neutron::params') }
it 'configures logging' do it 'configures logging' do
should contain_neutron_config('DEFAULT/log_file').with_ensure('absent') should contain_neutron_config('DEFAULT/log_file').with_ensure('absent')
should contain_neutron_config('DEFAULT/log_dir').with_value(p[:log_dir]) should contain_neutron_config('DEFAULT/log_dir').with_value(p[:log_dir])