From 16ec1659c94eb12accf0088d187d6a020ed382e0 Mon Sep 17 00:00:00 2001 From: Nate Potter Date: Mon, 16 Nov 2015 16:33:41 +0000 Subject: [PATCH] Add test coverage for neutron::db::mysql Currently many tests in neutron_db_mysql_spec.rb don't check anything. This patch adds the test coverage for mysql and removes the differentiation between Debian and Redhat in this file, because the tests are the same. Change-Id: I2e435afd88834868a6835c4eb246ec16067bae14 --- spec/classes/neutron_db_mysql_spec.rb | 64 ++++++++++++++++----------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/spec/classes/neutron_db_mysql_spec.rb b/spec/classes/neutron_db_mysql_spec.rb index a157ea3e0..5087b3f13 100644 --- a/spec/classes/neutron_db_mysql_spec.rb +++ b/spec/classes/neutron_db_mysql_spec.rb @@ -7,36 +7,18 @@ describe 'neutron::db::mysql' do end let :params do - { :password => 'passw0rd', + { + :password => 'passw0rd', } end - let :default_facts do - { :operatingsystem => 'default', - :operatingsystemrelease => 'default' + let :facts do + { + :osfamily => 'Debian', } end - - context 'on Debian platforms' do - let :facts do - default_facts.merge({ :osfamily => 'Debian' }) - end - - it { is_expected.to contain_openstacklib__db__mysql('neutron').with( - :user => 'neutron', - :password_hash => '*74B1C21ACE0C2D6B0678A5E503D2A60E8F9651A3', - :host => '127.0.0.1', - :charset => 'utf8', - :collate => 'utf8_general_ci', - ) } - end - - context 'on RedHat platforms' do - let :facts do - default_facts.merge({ :osfamily => 'RedHat' }) - end - + describe 'with only required params' do it { is_expected.to contain_openstacklib__db__mysql('neutron').with( :user => 'neutron', :password_hash => '*74B1C21ACE0C2D6B0678A5E503D2A60E8F9651A3', @@ -50,30 +32,58 @@ describe 'neutron::db::mysql' do let :params do { :password => 'neutronpass', - :allowed_hosts => ['127.0.0.1','%'] + :allowed_hosts => ['127.0.0.1','%'], } end + it { is_expected.to contain_openstacklib__db__mysql('neutron').with( + :user => 'neutron', + :password_hash => '*E7D4FEBBE0A141B5E4B413EAF85CCB49746A2497', + :host => '127.0.0.1', + :charset => 'utf8', + :collate => 'utf8_general_ci', + :allowed_hosts => ['127.0.0.1','%'], + ) } + end describe "overriding allowed_hosts param to string" do let :params do { :password => 'neutronpass2', - :allowed_hosts => '192.168.1.1' + :allowed_hosts => '192.168.1.1', } end + it { is_expected.to contain_openstacklib__db__mysql('neutron').with( + :user => 'neutron', + :password_hash => '*32C4202C8C2D4430442B55CCA765BD47D5D2E1A2', + :host => '127.0.0.1', + :charset => 'utf8', + :collate => 'utf8_general_ci', + :allowed_hosts => '192.168.1.1', + ) } + end describe "overriding allowed_hosts param equals to host param " do let :params do { :password => 'neutronpass2', - :allowed_hosts => '127.0.0.1' + :allowed_hosts => '127.0.0.1', } end + it { is_expected.to contain_openstacklib__db__mysql('neutron').with( + :user => 'neutron', + :password_hash => '*32C4202C8C2D4430442B55CCA765BD47D5D2E1A2', + :host => '127.0.0.1', + :charset => 'utf8', + :collate => 'utf8_general_ci', + :allowed_hosts => '127.0.0.1', + ) } + end + end