Merge pull request #58 from kevpl/maint_stop_waiting_for_host

(MAINT) remove wait_for_host_in_dashboard call
puppetlabs · Feb 22, 2017 · 2a3fd63 · 2a3fd63
2 parents efae323 + f6d3ee4
commit 2a3fd63
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/lib/beaker-pe/install/pe_utils.rb b/lib/beaker-pe/install/pe_utils.rb
@@ -497,10 +497,6 @@ def do_install hosts, opts = {}
               end
             end
 
-            install_hosts.each do |host|
-              wait_for_host_in_dashboard(host)
-            end
-
             # only appropriate for pre-3.9 builds
             if version_is_less(master[:pe_ver], '3.99')
               if pre30master

diff --git a/spec/beaker-pe/install/pe_utils_spec.rb b/spec/beaker-pe/install/pe_utils_spec.rb
@@ -811,7 +811,6 @@ def slice_installer_options(host)
       allow( subject ).to receive( :stop_agent_on ).and_return( true )
       allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
       allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('3.0')
-      allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
         "puppet agent #{arg}"
       end
@@ -887,7 +886,6 @@ def slice_installer_options(host)
       expect( subject ).to_not receive( :sign_certificate_for )
       expect( subject ).to receive( :stop_agent_on ).with( hosts[0] ).once
       expect( subject ).to_not receive( :sleep_until_puppetdb_started )
-      expect( subject ).to_not receive( :wait_for_host_in_dashboard )
       expect( subject ).to_not receive( :on ).with( hosts[0], /puppet agent -t/, :acceptable_exit_codes => [0,2] )
 
       hosts.each do |host|
@@ -916,7 +914,6 @@ def slice_installer_options(host)
       allow( subject ).to receive( :stop_agent_on ).and_return( true )
       allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
       allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('4.0')
-      allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
         "puppet agent #{arg}"
       end
@@ -993,7 +990,6 @@ def slice_installer_options(host)
       allow( subject ).to receive( :stop_agent_on ).and_return( true )
       allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
       allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('4.0')
-      allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
         "puppet agent #{arg}"
       end
@@ -1063,7 +1059,6 @@ def slice_installer_options(host)
       allow( subject ).to receive( :stop_agent_on ).and_return( true )
       allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
       allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('4.0')
-      allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
         "puppet agent #{arg}"
       end