Skip to content

Commit

Permalink
Merge pull request #7 from tvpartytonight/BKR-656
Browse files Browse the repository at this point in the history
(maint) Remove leftover comments
  • Loading branch information
kevpl committed May 16, 2016
2 parents c1ea366 + c7ce982 commit aa56665
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/beaker-pe/install/pe_utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ def upgrade_pe_on upgrade_hosts, opts, path=nil
# This is ignored if a pe_upgrade_ver and pe_upgrade_dir are specified
# in the host configuration file.
# @example
# pre_host_for_upgrade(master, {}, "http://neptune.puppetlabs.lan/3.0/ci-ready/")
# prep_host_for_upgrade(master, {}, "http://neptune.puppetlabs.lan/3.0/ci-ready/")
def prep_host_for_upgrade(host, opts={}, path='')
host['pe_dir'] = host['pe_upgrade_dir'] || path
if host['platform'] =~ /windows/
Expand Down
5 changes: 2 additions & 3 deletions spec/beaker-pe/install/pe_utils_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ class ClassMixedWithDSLInstallUtils

attr_accessor :hosts

# Because some the methods now actually call out to the `step` method, we need to
# mock out `metadata` that is initialized in a test case.
def metadata
@metadata ||= {}
end
Expand Down Expand Up @@ -444,9 +446,6 @@ def logger
#run rake task on dashboard

expect( subject ).to receive( :on ).with( hosts[0], /\/opt\/puppet\/bin\/rake -sf \/opt\/puppet\/share\/puppet-dashboard\/Rakefile .* RAILS_ENV=production/ ).once
#wait for all hosts to appear in the dashboard
#run puppet agent now that installation is complete
#expect( subject ).to receive( :on ).with( hosts, /puppet agent/, :acceptable_exit_codes => [0,2] ).once

hosts.each do |host|
allow( host ).to receive( :tmpdir )
Expand Down

0 comments on commit aa56665

Please sign in to comment.