Skip to content

Commit

Permalink
Fix breaking unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ehelms committed Sep 2, 2016
1 parent 8b4bb69 commit dac74af
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
4 changes: 0 additions & 4 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/katello_config_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/katello_install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion spec/classes/katello_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -44,6 +44,7 @@
:operatingsystemmajrelease => '1',
:operatingsystemrelease => '1',
:osfamily => 'UNSUPPORTED OSFAMILY',
:root_home => '/root'
}
end

Expand Down

0 comments on commit dac74af

Please # to comment.