From fd7308a61474aa4b331cf80d5b72dd078ced7594 Mon Sep 17 00:00:00 2001 From: Eric D Helms Date: Fri, 2 Sep 2016 12:52:43 -0400 Subject: [PATCH] Fix breaking unit tests (#143) --- manifests/init.pp | 4 ---- spec/classes/katello_config_spec.rb | 2 +- spec/classes/katello_install_spec.rb | 2 +- spec/classes/katello_spec.rb | 3 ++- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 4ce431b1..3f198a34 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -21,8 +21,6 @@ # # $config_dir:: Location for Katello config files # -# $use_passenger:: Whether Katello is being deployed with Passenger -# # $proxy_url:: URL of the proxy server # # $proxy_port:: Port the proxy is running on @@ -60,8 +58,6 @@ $log_dir = $katello::params::log_dir, $config_dir = $katello::params::config_dir, - $use_passenger = $katello::params::use_passenger, - $proxy_url = $katello::params::proxy_url, $proxy_port = $katello::params::proxy_port, $proxy_username = $katello::params::proxy_username, diff --git a/spec/classes/katello_config_spec.rb b/spec/classes/katello_config_spec.rb index 6ce10b35..92fdb71d 100644 --- a/spec/classes/katello_config_spec.rb +++ b/spec/classes/katello_config_spec.rb @@ -3,7 +3,7 @@ describe 'katello::config' do on_supported_os.each do |os, facts| let :facts do - facts.merge(:concat_basedir => '/tmp', :mongodb_version => '2.4.14') + facts.merge(:concat_basedir => '/tmp', :mongodb_version => '2.4.14', :root_home => '/root') end context 'default config settings' do diff --git a/spec/classes/katello_install_spec.rb b/spec/classes/katello_install_spec.rb index 46c0c9aa..19cc2888 100644 --- a/spec/classes/katello_install_spec.rb +++ b/spec/classes/katello_install_spec.rb @@ -4,7 +4,7 @@ on_supported_os.each do |os, facts| context "on #{os}" do let :facts do - facts.merge(:concat_basedir => '/tmp', :mongodb_version => '2.4.14') + facts.merge(:concat_basedir => '/tmp', :mongodb_version => '2.4.14', :root_home => '/root') end describe 'with enable_ostree == false' do diff --git a/spec/classes/katello_spec.rb b/spec/classes/katello_spec.rb index a4450c17..29e4318c 100644 --- a/spec/classes/katello_spec.rb +++ b/spec/classes/katello_spec.rb @@ -4,7 +4,7 @@ on_supported_os.each do |os, facts| context "on #{os}" do let :facts do - facts.merge(:concat_basedir => '/tmp', :mongodb_version => '2.4.14') + facts.merge(:concat_basedir => '/tmp', :mongodb_version => '2.4.14', :root_home => '/root') end let(:pre_condition) do @@ -44,6 +44,7 @@ :operatingsystemmajrelease => '1', :operatingsystemrelease => '1', :osfamily => 'UNSUPPORTED OSFAMILY', + :root_home => '/root' } end