From 5f0927509d0aa96bd29ae8c7b7332f9407dddf1b Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 31 Jan 2014 19:20:40 +0100 Subject: [PATCH] unit tests: cleanup - database: drop debian specific cases for now. I'll add deep unit tests when we will support all OS which is not the case now. - image: drop useless param Close #133 Signed-off-by: Emilien Macchi --- spec/classes/cloud_database_sql_spec.rb | 19 ------------------- spec/classes/cloud_image_spec.rb | 1 - 2 files changed, 20 deletions(-) diff --git a/spec/classes/cloud_database_sql_spec.rb b/spec/classes/cloud_database_sql_spec.rb index 8dd28f4f..704f4524 100644 --- a/spec/classes/cloud_database_sql_spec.rb +++ b/spec/classes/cloud_database_sql_spec.rb @@ -57,7 +57,6 @@ describe 'cloud::database::sql' do :neutron_db_password => 'secrete', :neutron_db_allowed_hosts => ['10.0.0.1','10.0.0.2','10.0.0.3'], :mysql_root_password => 'secrete', - :mysql_sys_maint_user => 'sys-maint', :mysql_sys_maint_password => 'sys', :galera_clustercheck_dbuser => 'clustercheckuser', :galera_clustercheck_dbpassword => 'clustercheckpassword!', @@ -166,26 +165,8 @@ describe 'cloud::database::sql' do should contain_database_grant("#{params[:galera_clustercheck_dbuser]}@localhost/monitoring").with( :privileges => 'all' ) - should contain_database_user("#{params[:mysql_sys_maint_user]}@localhost").with( - :ensure => 'present', - :password_hash => '*BE353D0D7826681F8B7C136ED9824915F5B99E7D', - :provider => 'mysql' - ) end # configure monitoring database end # configure databases on the galera master server - - context 'configure MySQL sys config' do - it { should contain_file('/etc/mysql/sys.cnf').with( - :mode => '0600', - :owner => 'root', - :group => 'root', - :require => 'Exec[clean-mysql-binlog]' - )} - - it { should contain_file('/etc/mysql/sys.cnf').with_content(/password = #{params[:mysql_sys_maint_password]}/)} - - end # configure MySQL sys config - end # openstack database sql context 'on Debian platforms' do diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb index ad01eb94..aba827b5 100644 --- a/spec/classes/cloud_image_spec.rb +++ b/spec/classes/cloud_image_spec.rb @@ -27,7 +27,6 @@ describe 'cloud::image' do :glance_db_user => 'glance', :glance_db_password => 'secrete', :ks_keystone_internal_host => '10.0.0.1', - :ks_glance_internal_host => '10.0.0.1', :openstack_vip => '10.0.0.42', :ks_glance_api_internal_port => '9292', :ks_glance_password => 'secrete',