From a28cb64fb0cb17099e74f629db544442a22612d5 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Thu, 17 Jan 2019 22:15:10 +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: I55684e165af02b7c4285075b8843eba1ef94824d
---
 spec/classes/ceilometer_db_spec.rb | 117 +++--------------------------
 1 file changed, 9 insertions(+), 108 deletions(-)

diff --git a/spec/classes/ceilometer_db_spec.rb b/spec/classes/ceilometer_db_spec.rb
index 4fae14a1..b5b077d6 100644
--- a/spec/classes/ceilometer_db_spec.rb
+++ b/spec/classes/ceilometer_db_spec.rb
@@ -1,14 +1,11 @@
 require 'spec_helper'
 
 describe 'ceilometer::db' do
-
   shared_examples 'ceilometer::db' do
-
     context 'with default parameters' do
+      it { should contain_class('ceilometer::deps') }
 
-      it { is_expected.to contain_class('ceilometer::params') }
-      it { is_expected.to contain_class('ceilometer::db::sync') }
-      it { is_expected.to contain_oslo__db('ceilometer_config').with(
+      it { should contain_oslo__db('ceilometer_config').with(
         :db_max_retries => '<SERVICE DEFAULT>',
         :connection     => 'mysql+pymysql://ceilometer:ceilometer@localhost/ceilometer',
         :idle_timeout   => '<SERVICE DEFAULT>',
@@ -20,6 +17,7 @@ describe 'ceilometer::db' do
         :pool_timeout   => '<SERVICE DEFAULT>',
       )}
 
+      it { should contain_class('ceilometer::db::sync') }
     end
 
     context 'with specific parameters' do
@@ -37,8 +35,9 @@ describe 'ceilometer::db' do
           :sync_db                 => false }
       end
 
-      it { is_expected.not_to contain_class('ceilometer::db::sync') }
-      it { is_expected.to contain_oslo__db('ceilometer_config').with(
+      it { should contain_class('ceilometer::deps') }
+
+      it { should contain_oslo__db('ceilometer_config').with(
         :db_max_retries => '-1',
         :connection     => 'mongodb://localhost:1234/ceilometer',
         :idle_timeout   => '3601',
@@ -50,97 +49,7 @@ describe 'ceilometer::db' do
         :pool_timeout   => '21',
       )}
 
-    end
-
-    context 'with pymysql connection' do
-      let :params do
-        { :database_connection => 'mysql+pymysql://ceilometer:ceilometer@localhost/ceilometer' }
-      end
-
-      it { is_expected.to contain_class('ceilometer::params') }
-      it { is_expected.to contain_class('ceilometer::db::sync') }
-      it { is_expected.to contain_oslo__db('ceilometer_config').with(
-        :connection => 'mysql+pymysql://ceilometer:ceilometer@localhost/ceilometer',
-      )}
-    end
-
-    context 'with mongodb backend' do
-      let :params do
-        { :database_connection => 'mongodb://localhost:1234/ceilometer' }
-      end
-
-      it 'install the proper backend package' do
-        is_expected.to contain_package('python-pymongo').with(
-          :ensure => 'present',
-          :name   => 'python-pymongo',
-          :tag    => 'openstack'
-        )
-      end
-    end
-
-    context 'with incorrect database_connection string' do
-      let :params do
-        { :database_connection => 'redis://ceilometer:ceilometer@localhost/ceilometer', }
-      end
-
-      it_raises 'a Puppet::Error', /validate_re/
-    end
-
-    context 'with postgresql backend' do
-      let :params do
-        { :database_connection => 'postgresql://ceilometer:ceilometer@localhost/ceilometer', }
-      end
-
-      it 'install the proper backend package' do
-        is_expected.to contain_package('python-psycopg2').with(:ensure => 'present')
-      end
-    end
-
-    context 'with incorrect pymysql database_connection string' do
-      let :params do
-        { :database_connection => 'foo+pymysql://ceilometer:ceilometer@localhost/ceilometer', }
-      end
-
-      it_raises 'a Puppet::Error', /validate_re/
-    end
-
-  end
-
-  shared_examples_for 'ceilometer::db on Debian' do
-    context 'with sqlite backend' do
-      let :params do
-        { :database_connection => 'sqlite:///var/lib/ceilometer.db', }
-      end
-
-      it 'install the proper backend package' do
-        is_expected.to contain_package('python-pysqlite2').with(
-          :ensure => 'present',
-          :name   => 'python-pysqlite2',
-          :tag    => 'openstack'
-        )
-      end
-    end
-
-    context 'using pymysql driver' do
-      let :params do
-        { :database_connection => 'mysql+pymysql:///ceilometer:ceilometer@localhost/ceilometer', }
-      end
-
-      it 'install the proper backend package' do
-        is_expected.to contain_package('python-pymysql').with(
-          :ensure => 'present',
-          :name   => 'python-pymysql',
-          :tag    => 'openstack'
-        )
-      end
-    end
-  end
-
-  shared_examples_for 'ceilometer::db on RedHat' do
-    context 'using pymysql driver' do
-      let :params do
-        { :database_connection => 'mysql+pymysql:///ceilometer:ceilometer@localhost/ceilometer', }
-      end
+      it { should_not contain_class('ceilometer::db::sync') }
     end
   end
 
@@ -150,20 +59,12 @@ describe 'ceilometer::db' do
     context "on #{os}" do
       let (:facts) do
         facts.merge!(OSDefaults.get_facts({
-          :concat_basedir         => '/var/lib/puppet/concat',
-          :fqdn                   => 'some.host.tld',
+          :concat_basedir => '/var/lib/puppet/concat',
+          :fqdn           => 'some.host.tld',
         }))
       end
 
-      case facts[:osfamily]
-      when 'Debian'
-        it_behaves_like 'ceilometer::db on Debian'
-      when 'RedHat'
-        it_behaves_like 'ceilometer::db on RedHat'
-      end
-
       it_behaves_like 'ceilometer::db'
     end
   end
-
 end