From c67c2017e1b5004d89dc5f865e708b21f1588cda Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Sat, 30 Apr 2016 11:34:53 +0800 Subject: [PATCH] Test multiple operating systems for db This change updates the tests for mistral::db::postgresql and mistral::db::sync to test multiple operating systems. Change-Id: Ia362e005c253485db685880ddb5001a0cce5adef --- spec/classes/mistral_db_postgresql_spec.rb | 48 ++++++++-------------- spec/classes/mistral_db_sync_spec.rb | 33 ++++++--------- 2 files changed, 28 insertions(+), 53 deletions(-) diff --git a/spec/classes/mistral_db_postgresql_spec.rb b/spec/classes/mistral_db_postgresql_spec.rb index 495a340..2688a1a 100644 --- a/spec/classes/mistral_db_postgresql_spec.rb +++ b/spec/classes/mistral_db_postgresql_spec.rb @@ -2,21 +2,13 @@ require 'spec_helper' describe 'mistral::db::postgresql' do - let :req_params do - { :password => 'pw' } - end + shared_examples_for 'mistral::db::postgresql' do + let :req_params do + { :password => 'pw' } + end - let :pre_condition do - 'include postgresql::server' - end - - context 'on a RedHat osfamily' do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7.0', - :concat_basedir => '/var/lib/puppet/concat' - } + let :pre_condition do + 'include postgresql::server' end context 'with only required parameters' do @@ -32,27 +24,19 @@ describe 'mistral::db::postgresql' do end - context 'on a Debian osfamily' do - let :facts do - { - :operatingsystemrelease => '7.8', - :operatingsystem => 'Debian', - :osfamily => 'Debian', - :concat_basedir => '/var/lib/puppet/concat' - } - end - - context 'with only required parameters' do - let :params do - req_params + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| + context "on #{os}" do + let (:facts) do + facts.merge(OSDefaults.get_facts({ + :processorcount => 8, + :concat_basedir => '/var/lib/puppet/concat' + })) end - it { is_expected.to contain_postgresql__server__db('mistral').with( - :user => 'mistral', - :password => 'md56cc4a9db977897a441d3a498a5d94fce' - )} + it_configures 'mistral::db::postgresql' end - end end diff --git a/spec/classes/mistral_db_sync_spec.rb b/spec/classes/mistral_db_sync_spec.rb index a64c040..d6036b2 100644 --- a/spec/classes/mistral_db_sync_spec.rb +++ b/spec/classes/mistral_db_sync_spec.rb @@ -26,28 +26,19 @@ describe 'mistral::db::sync' do end - context 'on a RedHat osfamily' do - let :facts do - { - :osfamily => 'RedHat', - :operatingsystemrelease => '7.0', - :concat_basedir => '/var/lib/puppet/concat' - } + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| + context "on #{os}" do + let (:facts) do + facts.merge(OSDefaults.get_facts({ + :processorcount => 8, + :concat_basedir => '/var/lib/puppet/concat' + })) + end + + it_configures 'mistral-db-sync' end - - it_configures 'mistral-db-sync' - end - - context 'on a Debian osfamily' do - let :facts do - { - :operatingsystemrelease => '8.0', - :osfamily => 'Debian', - :concat_basedir => '/var/lib/puppet/concat' - } - end - - it_configures 'mistral-db-sync' end end