openstack
/
puppet-panko
Code Issues Proposed changes

Fix unit tests 

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.

Change-Id: Ia3ec5a877d6e59520821fe6cd62d6b2f335d8b27
Depends-On: I9d535ab38afea852559df2b3073bd4b74a2a3947
This commit is contained in:
Alex Schultz 2017-07-13 15:41:16 -06:00
parent e39b111000
commit 908a6633e8
1 changed files with 40 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
spec/classes/panko_wsgi_apache_spec.rb
View File

@ -3,55 +3,29 @@ require 'spec_helper'
describe 'panko::wsgi::apache' do
shared_examples_for 'apache serving panko with mod_wsgi' do
it { is_expected.to contain_service('httpd').with_name(platform_params[:httpd_service_name]) }
it { is_expected.to contain_class('panko::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' => 'panko',
'group' => 'panko',
'require' => 'Package[httpd]'
context 'with default parameters' do
it { is_expected.to contain_class('panko::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('panko_wsgi').with(
:bind_port => 8977,
:group => 'panko',
:path => '/',
:servername => facts[:fqdn],
:ssl => true,
:threads => facts[:os_workers],
:user => 'panko',
:workers => 1,
:wsgi_daemon_process => 'panko',
:wsgi_process_group => 'panko',
: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('panko_wsgi').with(
'ensure' => 'file',
'path' => "#{platform_params[:wsgi_script_path]}/app",
'source' => platform_params[:wsgi_script_source],
'owner' => 'panko',
'group' => 'panko',
'mode' => '0644'
)}
it { is_expected.to contain_file('panko_wsgi').that_requires("File[#{platform_params[:wsgi_script_path]}]") }
it { is_expected.to contain_apache__vhost('panko_wsgi').with(
'servername' => 'some.host.tld',
'ip' => nil,
'port' => '8977',
'docroot' => "#{platform_params[:wsgi_script_path]}",
'docroot_owner' => 'panko',
'docroot_group' => 'panko',
'ssl' => 'true',
'wsgi_daemon_process' => 'panko',
'wsgi_daemon_process_options' => {
'user' => 'panko',
'group' => 'panko',
'processes' => 1,
'threads' => '4',
'display-name' => 'panko_wsgi',
},
'wsgi_process_group' => 'panko',
'wsgi_script_aliases' => { '/' => "#{platform_params[:wsgi_script_path]}/app" },
'require' => 'File[panko_wsgi]'
)}
it { is_expected.to contain_concat("#{platform_params[:httpd_ports_file]}") }
end
describe 'when overriding parameters using different ports' do
context 'when overriding parameters using different ports' do
let :params do
{
:servername => 'dummy.host',
@ -62,29 +36,27 @@ describe 'panko::wsgi::apache' do
:workers => 8,
}
end
it { is_expected.to contain_apache__vhost('panko_wsgi').with(
'servername' => 'dummy.host',
'ip' => '10.42.51.1',
'port' => '12345',
'docroot' => "#{platform_params[:wsgi_script_path]}",
'docroot_owner' => 'panko',
'docroot_group' => 'panko',
'ssl' => 'false',
'wsgi_daemon_process' => 'panko',
'wsgi_daemon_process_options' => {
'user' => 'panko',
'group' => 'panko',
'processes' => '8',
'threads' => '4',
'display-name' => 'panko',
},
'wsgi_process_group' => 'panko',
'wsgi_script_aliases' => { '/' => "#{platform_params[:wsgi_script_path]}/app" },
'require' => 'File[panko_wsgi]'
it { is_expected.to contain_class('panko::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('panko_wsgi').with(
:bind_host => '10.42.51.1',
:bind_port => 12345,
:group => 'panko',
:path => '/',
:servername => 'dummy.host',
:ssl => false,
:threads => facts[:os_workers],
:user => 'panko',
:workers => 8,
:wsgi_daemon_process => 'panko',
:wsgi_process_display_name => 'panko',
:wsgi_process_group => 'panko',
: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