openstack/puppet-gnocchi
Code Issues Proposed changes

Fix unit tests

Browse Source 
The unit tests were broken by a change to openstacklib
Id09c3358c5843510e6a2a8c0e2d4aeb3607e098b which renamed some of the
resources in the openstacklib classes. The problem is that our tests in
this module should not have been testing what occurs within openstacklib
so this fix updates the tests to only check what we are doing within
this module.

Depends-On: I9d535ab38afea852559df2b3073bd4b74a2a3947
Change-Id: I5cbad73a13d2861889019bcfb0b58753ac9b9e3f
This commit is contained in:
Alex Schultz
2017-07-13 14:27:16 -06:00
parent c03444d013
commit 0f135a4a45
1 changed files with 40 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
spec/classes/gnocchi_wsgi_apache_spec.rb
View File

@@ -3,56 +3,29 @@ require 'spec_helper'
describe 'gnocchi::wsgi::apache' do
shared_examples_for 'apache serving gnocchi with mod_wsgi' do
it { is_expected.to contain_service('httpd').with_name(platform_params[:httpd_service_name]) }
it { is_expected.to contain_class('gnocchi::deps') }
it { is_expected.to contain_class('gnocchi::params') }
it { is_expected.to contain_class('apache') }
it { is_expected.to contain_class('apache::mod::wsgi') }
describe 'with default parameters' do
it { is_expected.to contain_file("#{platform_params[:wsgi_script_path]}").with(
'ensure' => 'directory',
'owner' => 'gnocchi',
'group' => 'gnocchi',
'require' => 'Package[httpd]'
context 'with default parameters' do
it { is_expected.to contain_class('gnocchi::params') }
it { is_expected.to contain_class('apache') }
it { is_expected.to contain_class('apache::mod::wsgi') }
it { is_expected.to contain_class('apache::mod::ssl') }
it { is_expected.to contain_openstacklib__wsgi__apache('gnocchi_wsgi').with(
:bind_port => 8041,
:group => 'gnocchi',
:path => '/',
:servername => facts[:fqdn],
:ssl => true,
:threads => 1,
:user => 'gnocchi',
:workers => facts[:os_workers],
:wsgi_daemon_process => 'gnocchi',
:wsgi_process_group => 'gnocchi',
:wsgi_script_dir => platform_params[:wsgi_script_path],
:wsgi_script_file => 'app',
:wsgi_script_source => platform_params[:wsgi_script_source],
)}
it { is_expected.to contain_file('gnocchi_wsgi').with(
'ensure' => 'file',
'path' => "#{platform_params[:wsgi_script_path]}/app",
'source' => platform_params[:wsgi_script_source],
'owner' => 'gnocchi',
'group' => 'gnocchi',
'mode' => '0644'
)}
it { is_expected.to contain_file('gnocchi_wsgi').that_requires("File[#{platform_params[:wsgi_script_path]}]") }
it { is_expected.to contain_apache__vhost('gnocchi_wsgi').with(
'servername' => 'some.host.tld',
'ip' => nil,
'port' => '8041',
'docroot' => "#{platform_params[:wsgi_script_path]}",
'docroot_owner' => 'gnocchi',
'docroot_group' => 'gnocchi',
'ssl' => 'true',
'wsgi_daemon_process_options' => {
'user' => 'gnocchi',
'group' => 'gnocchi',
'processes' => '4',
'threads' => '1',
'display-name' => 'gnocchi_wsgi',
},
'wsgi_daemon_process' => 'gnocchi',
'wsgi_process_group' => 'gnocchi',
'wsgi_script_aliases' => { '/' => "#{platform_params[:wsgi_script_path]}/app" },
'require' => 'File[gnocchi_wsgi]'
)}
it { is_expected.to contain_concat("#{platform_params[:httpd_ports_file]}") }
end
describe 'when overriding parameters using different ports' do
context 'when overriding paramters using different ports' do
let :params do
{
:servername => 'dummy.host',
@@ -65,28 +38,27 @@ describe 'gnocchi::wsgi::apache' do
}
end
it { is_expected.to contain_apache__vhost('gnocchi_wsgi').with(
'servername' => 'dummy.host',
'ip' => '10.42.51.1',
'port' => '12345',
'docroot' => "#{platform_params[:wsgi_script_path]}",
'docroot_owner' => 'gnocchi',
'docroot_group' => 'gnocchi',
'ssl' => 'false',
'wsgi_daemon_process_options' => {
'user' => 'gnocchi',
'group' => 'gnocchi',
'processes' => '8',
'threads' => '2',
'display-name' => 'gnocchi',
},
'wsgi_daemon_process' => 'gnocchi',
'wsgi_process_group' => 'gnocchi',
'wsgi_script_aliases' => { '/' => "#{platform_params[:wsgi_script_path]}/app" },
'require' => 'File[gnocchi_wsgi]'
it { is_expected.to contain_class('gnocchi::params') }
it { is_expected.to contain_class('apache') }
it { is_expected.to contain_class('apache::mod::wsgi') }
it { is_expected.to_not contain_class('apache::mod::ssl') }
it { is_expected.to contain_openstacklib__wsgi__apache('gnocchi_wsgi').with(
:bind_host => '10.42.51.1',
:bind_port => 12345,
:group => 'gnocchi',
:path => '/',
:servername => 'dummy.host',
:ssl => false,
:threads => 2,
:user => 'gnocchi',
:workers => 8,
:wsgi_daemon_process => 'gnocchi',
:wsgi_process_display_name => 'gnocchi',
:wsgi_process_group => 'gnocchi',
:wsgi_script_dir => platform_params[:wsgi_script_path],
:wsgi_script_file => 'app',
:wsgi_script_source => platform_params[:wsgi_script_source],
)}
it { is_expected.to contain_concat("#{platform_params[:httpd_ports_file]}") }
end
end