From 9ec8f9c67ad6a01553e25f76168b6cbbf63e8bb5 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Fri, 18 Jan 2019 10:07:43 +0100
Subject: [PATCH] Remove redundantly tested code

Remove code that is redundantly tested.

This should not be tested here but in puppet-oslo
where this logic resides.

If we keep this and we do changes in puppet-oslo we
will break these unit tests, this is something we need
to sort out for all modules.

Change-Id: Idb97ddf08144a8350635ed2a7221477960e17c92
---
 spec/classes/barbican_db_spec.rb | 78 ++++++++------------------------
 1 file changed, 18 insertions(+), 60 deletions(-)

diff --git a/spec/classes/barbican_db_spec.rb b/spec/classes/barbican_db_spec.rb
index 50980377..f79081ee 100644
--- a/spec/classes/barbican_db_spec.rb
+++ b/spec/classes/barbican_db_spec.rb
@@ -22,7 +22,9 @@ require 'spec_helper'
 describe 'barbican::db' do
   shared_examples 'barbican::db' do
     context 'with default parameters' do
-      it { is_expected.to contain_oslo__db('barbican_config').with(
+      it { should contain_class('barbican::deps') }
+
+      it { should contain_oslo__db('barbican_config').with(
         :db_max_retries => '<SERVICE DEFAULT>',
         :connection     => 'sqlite:////var/lib/barbican/barbican.sqlite',
         :idle_timeout   => '<SERVICE DEFAULT>',
@@ -35,15 +37,16 @@ describe 'barbican::db' do
       )}
 
       # TODO(aschultz): remove once oslo is properly used
-      it { is_expected.to contain_barbican_config('DEFAULT/sql_connection').with_value('sqlite:////var/lib/barbican/barbican.sqlite') }
-      it { is_expected.to contain_barbican_config('DEFAULT/sql_idle_timeout').with_value('<SERVICE DEFAULT>') }
-      it { is_expected.to contain_barbican_config('DEFAULT/sql_pool_size').with_value('<SERVICE DEFAULT>') }
-      it { is_expected.to contain_barbican_config('DEFAULT/sql_pool_max_overflow').with_value('<SERVICE DEFAULT>') }
+      it { should contain_barbican_config('DEFAULT/sql_connection').with_value('sqlite:////var/lib/barbican/barbican.sqlite') }
+      it { should contain_barbican_config('DEFAULT/sql_idle_timeout').with_value('<SERVICE DEFAULT>') }
+      it { should contain_barbican_config('DEFAULT/sql_pool_size').with_value('<SERVICE DEFAULT>') }
+      it { should contain_barbican_config('DEFAULT/sql_pool_max_overflow').with_value('<SERVICE DEFAULT>') }
     end
 
     context 'with specific parameters' do
       let :params do
-        { :database_connection     => 'mysql+pymysql://barbican:barbican@localhost/barbican',
+        {
+          :database_connection     => 'mysql+pymysql://barbican:barbican@localhost/barbican',
           :database_idle_timeout   => '3601',
           :database_min_pool_size  => '2',
           :database_max_pool_size  => '11',
@@ -56,7 +59,9 @@ describe 'barbican::db' do
         }
       end
 
-      it { is_expected.to contain_oslo__db('barbican_config').with(
+      it { should contain_class('barbican::deps') }
+
+      it { should contain_oslo__db('barbican_config').with(
         :db_max_retries => '-1',
         :connection     => 'mysql+pymysql://barbican:barbican@localhost/barbican',
         :idle_timeout   => '3601',
@@ -69,57 +74,15 @@ describe 'barbican::db' do
       )}
 
       # TODO(aschultz) remove once oslo is properly used
-      it { is_expected.to contain_barbican_config('DEFAULT/sql_connection').with_value('mysql+pymysql://barbican:barbican@localhost/barbican').with_secret(true) }
-      it { is_expected.to contain_barbican_config('DEFAULT/sql_idle_timeout').with_value('3601') }
-      it { is_expected.to contain_barbican_config('DEFAULT/sql_pool_size').with_value('2') }
-      it { is_expected.to contain_barbican_config('DEFAULT/sql_pool_max_overflow').with_value('11') }
-    end
-
-    context 'with postgresql backend' do
-      let :params do
-        { :database_connection => 'postgresql://barbican:barbican@localhost/barbican', }
-      end
-
-      it 'install the proper backend package' do
-        is_expected.to contain_package('python-psycopg2').with(:ensure => 'present')
-      end
-    end
-
-    context 'with MySQL-python library as backend package' do
-      let :params do
-        { :database_connection => 'mysql://barbican:barbican@localhost/barbican', }
-      end
-
-      it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }
-    end
-
-    context 'with incorrect database_connection string' do
-      let :params do
-        { :database_connection => 'redis://barbican:barbican@localhost/barbican', }
-      end
-
-      it_raises 'a Puppet::Error', /validate_re/
-    end
-
-    context 'with incorrect pymysql database_connection string' do
-      let :params do
-        { :database_connection => 'foo+pymysql://barbican:barbican@localhost/barbican', }
-      end
-
-      it_raises 'a Puppet::Error', /validate_re/
-    end
-  end
-
-  shared_examples_for 'barbican db on redhat' do
-    context 'using pymysql driver' do
-      let :params do
-        { :database_connection => 'mysql+pymysql://barbican:barbican@localhost/barbican', }
-      end
+      it { should contain_barbican_config('DEFAULT/sql_connection').with_value('mysql+pymysql://barbican:barbican@localhost/barbican').with_secret(true) }
+      it { should contain_barbican_config('DEFAULT/sql_idle_timeout').with_value('3601') }
+      it { should contain_barbican_config('DEFAULT/sql_pool_size').with_value('2') }
+      it { should contain_barbican_config('DEFAULT/sql_pool_max_overflow').with_value('11') }
     end
   end
 
   on_supported_os({
-    :supported_os   => OSDefaults.get_supported_os
+    :supported_os => OSDefaults.get_supported_os
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
@@ -130,12 +93,7 @@ describe 'barbican::db' do
         }))
       end
 
-      it_configures 'barbican::db'
-
-      case facts[:osfamily]
-      when 'RedHat'
-        it_configures 'barbican db on redhat'
-      end
+      it_behaves_like 'barbican::db'
     end
   end
 end