beaker 2.9.0 → 2.10.0

data/lib/beaker/host.rb

@@ -403,7 +403,8 @@ module Beaker
           end
           if options[:expect_connection_failure] && result.exit_code
             # should have had a connection failure, but didn't
-            raise CommandFailure, "Host '#{self}' should have resulted in a connection failure running:\n #{cmdline}\nLast #{@options[:trace_limit]} lines of output were:\n#{result.formatted_output(@options[:trace_limit])}"
+            # this can happen because of timing issues, so just raise a warning for now
+            @logger.warn "Host '#{self}' should have resulted in a connection failure running:\n #{cmdline}\nLast #{@options[:trace_limit]} lines of output were:\n#{result.formatted_output(@options[:trace_limit])}"
           end
           # No, TestCase has the knowledge about whether its failed, checking acceptable
           # exit codes at the host level and then raising...

data/lib/beaker/host/aix/exec.rb

@@ -1,6 +1,10 @@
 module Aix::Exec
   include Beaker::CommandFactory
 
+  def reboot
+    exec(Beaker::Command.new("shutdown -Fr"), :expect_connection_failure => true)
+  end
+
   def get_ip
     execute("ifconfig -a inet| awk '/broadcast/ {print $2}' | cut -d/ -f1 | head -1").strip
   end

data/lib/beaker/host/freebsd.rb

@@ -5,6 +5,14 @@ end
 module FreeBSD
   class Host < Unix::Host
 
+    [
+      'exec',
+    ].each do |lib|
+        require "beaker/host/freebsd/#{lib}"
+    end
+
+    include FreeBSD::Exec
+
     def self.foss_defaults
       h = Beaker::Options::OptionsHash.new
       h.merge({

data/lib/beaker/host/freebsd/exec.rb

@@ -0,0 +1,10 @@
+module FreeBSD::Exec
+  include Beaker::CommandFactory
+
+  def echo_to_file(str, filename)
+    # FreeBSD gets weird about special characters, we have to go a little OTT here
+    escaped_str = str.gsub(/\t/,'\\t').gsub(/\n/,'\\n')
+
+    exec(Beaker::Command.new("printf #{escaped_str} > #{filename}"))
+  end
+end

data/lib/beaker/host/pswindows/exec.rb

@@ -1,6 +1,10 @@
 module PSWindows::Exec
   include Beaker::CommandFactory
 
+  def reboot
+    exec(Beaker::Command.new("shutdown /r /t 0"), :expect_connection_failure => true)
+  end
+
   ABS_CMD = 'c:\\\\windows\\\\system32\\\\cmd.exe'
   CMD = 'cmd.exe'
 

data/lib/beaker/host/unix/exec.rb

@@ -1,6 +1,14 @@
 module Unix::Exec
   include Beaker::CommandFactory
 
+  def reboot
+    if self['platform'] =~ /solaris/
+      exec(Beaker::Command.new("reboot"), :expect_connection_failure => true)
+    else
+      exec(Beaker::Command.new("/sbin/shutdown -r now"), :expect_connection_failure => true)
+    end
+  end
+
   def echo(msg, abs=true)
     (abs ? '/bin/echo' : 'echo') + " #{msg}"
   end

data/lib/beaker/host/unix/pkg.rb

@@ -19,6 +19,9 @@ module Unix::Pkg
 
   def check_for_package(name)
     case self['platform']
+      when /sles-10/
+        result = exec(Beaker::Command.new("zypper se -i --match-exact #{name}"), :acceptable_exit_codes => (0...127))
+        result.stdout =~ /No packages found/ ? (return false) : (return result.exit_code == 0)
       when /sles-/
         result = exec(Beaker::Command.new("zypper se -i --match-exact #{name}"), :acceptable_exit_codes => (0...127))
       when /el-4/
@@ -208,4 +211,4 @@ module Unix::Pkg
         raise "Package repo cannot be deployed on #{self}; the platform is not supported"
     end
   end
-end
+end

data/lib/beaker/host/windows/exec.rb

@@ -1,6 +1,10 @@
 module Windows::Exec
   include Beaker::CommandFactory
 
+  def reboot
+    exec(Beaker::Command.new("shutdown /r /t 0"), :expect_connection_failure => true)
+  end
+
   ABS_CMD = 'c:\\\\windows\\\\system32\\\\cmd.exe'
   CMD = 'cmd.exe'
 

data/lib/beaker/host_prebuilt_steps.rb

@@ -13,8 +13,10 @@ module Beaker
     SLEEPWAIT = 5
     TRIES = 5
     UNIX_PACKAGES = ['curl', 'ntpdate']
+    FREEBSD_PACKAGES = ['curl']
     WINDOWS_PACKAGES = ['curl']
     PSWINDOWS_PACKAGES = []
+    SLES10_PACKAGES = ['curl']
     SLES_PACKAGES = ['curl', 'ntp']
     DEBIAN_PACKAGES = ['curl', 'ntpdate', 'lsb-release']
     CUMULUS_PACKAGES = ['addons', 'ntpdate', 'lsb-release']
@@ -87,6 +89,8 @@ module Beaker
       logger = opts[:logger]
       block_on host do |host|
         case
+        when host['platform'] =~ /sles-10/
+          check_and_install_packages_if_needed(host, SLES10_PACKAGES)
         when host['platform'] =~ /sles-/
           check_and_install_packages_if_needed(host, SLES_PACKAGES)
         when host['platform'] =~ /debian/
@@ -97,6 +101,8 @@ module Beaker
           check_and_install_packages_if_needed(host, WINDOWS_PACKAGES)
         when (host['platform'] =~ /windows/ and not host.is_cygwin?)
           check_and_install_packages_if_needed(host, PSWINDOWS_PACKAGES)
+        when host['platform'] =~ /freebsd/
+          check_and_install_packages_if_needed(host, FREEBSD_PACKAGES)
         when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus/
           check_and_install_packages_if_needed(host, UNIX_PACKAGES)
         end
@@ -289,7 +295,11 @@ module Beaker
     # @param [Host] host the host to act upon
     # @param [String] etc_hosts The string to append to the /etc/hosts file
     def set_etc_hosts(host, etc_hosts)
-      host.exec(Command.new("echo '#{etc_hosts}' > /etc/hosts"))
+      if host['platform'] =~ /freebsd/
+        host.echo_to_file(etc_hosts, '/etc/hosts')
+      else
+        host.exec(Command.new("echo '#{etc_hosts}' > /etc/hosts"))
+      end
     end
 
     #Make it possible to log in as root by copying the current users ssh keys to the root account
@@ -307,6 +317,8 @@ module Beaker
           host.exec(Command.new("if exist .ssh (xcopy .ssh C:\\Users\\Administrator\\.ssh /s /e)"))
         elsif host['platform'] =~ /osx/
           host.exec(Command.new('sudo cp -r .ssh /var/root/.'), {:pty => true})
+        elsif host['platform'] =~ /freebsd/
+          host.exec(Command.new('sudo cp -r .ssh /root/.'), {:pty => true})
         else
           host.exec(Command.new('sudo su -c "cp -r .ssh /root/."'), {:pty => true})
         end
@@ -345,6 +357,8 @@ module Beaker
         if host['platform'] =~ /osx/
           host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /etc/sshd_config"))
           host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /etc/sshd_config"))
+        elsif host['platform'] =~ /freebsd/
+          host.exec(Command.new("sudo sed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), {:pty => true} )
         elsif host.is_cygwin?
           host.exec(Command.new("sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""), {:pty => true})
         else
@@ -353,8 +367,12 @@ module Beaker
         #restart sshd
         if host['platform'] =~ /debian|ubuntu|cumulus/
           host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
+        elsif host['platform'] =~ /centos-7|el-7|redhat-7/
+          host.exec(Command.new("sudo -E systemctl restart sshd.service"), {:ptry => true})
         elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
           host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})
+        elsif host['platform'] =~ /freebsd/
+          host.exec(Command.new("sudo /etc/rc.d/sshd restart"))
         else
           logger.warn("Attempting to update ssh on non-supported platform: #{host.name}: #{host['platform']}")
         end
@@ -509,6 +527,9 @@ module Beaker
         when /debian|ubuntu|cumulus/
           host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
           host.exec(Command.new("service ssh restart"))
+        when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7/
+          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+          host.exec(Command.new("systemctl restart sshd.service"))
         when /el-|centos|fedora|redhat|oracle|scientific|eos/
           host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
           host.exec(Command.new("/sbin/service sshd restart"))
@@ -522,6 +543,9 @@ module Beaker
           host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
           host.exec(Command.new("stopsrc -g ssh"))
           host.exec(Command.new("startsrc -g ssh"))
+        when /freebsd/
+          host.echo_to_file('\nPermitUserEnvironment yes', '/etc/ssh/sshd_config')
+          host.exec(Command.new("sudo /etc/rc.d/sshd restart"))
         end
 
         if host['platform'] !~ /windows/ or (host['platform'] =~ /windows/ and host.is_cygwin?)

data/lib/beaker/hypervisor/openstack.rb

@@ -115,13 +115,28 @@ module Beaker
         # Associate a public IP to the server
         # Create if there are no floating ips available
         #
-        ip = @compute_client.addresses.find { |ip| ip.instance_id.nil? }
-        if ip.nil?
-          @logger.debug "Creating IP for #{host.name} (#{host[:vmhostname]})"
-          ip = @compute_client.addresses.create
+        # Do we already have an address?
+        @logger.debug vm.addresses
+
+        begin
+          if vm.addresses[@options[:openstack_network]]
+            address = vm.addresses[@options[:openstack_network]].map{ |network| network['addr'] }.first
+          end
+        rescue NoMethodError
+          @logger.debug "No current address retrievable from OpenStack data"
         end
-        ip.server = vm
-        host[:ip] = ip.ip
+        unless address
+          ip = @compute_client.addresses.find { |ip| ip.instance_id.nil? }
+
+          if ip.nil?
+            @logger.debug "Creating IP for #{host.name} (#{host[:vmhostname]})"
+            ip = @compute_client.addresses.create
+          end
+          ip.server = vm
+          address = ip.ip
+        end
+        host[:ip] = address
+
         @logger.debug "OpenStack host #{host.name} (#{host[:vmhostname]}) assigned ip: #{host[:ip]}"
 
         #set metadata
@@ -131,7 +146,7 @@ module Beaker
         @vms << vm
 
         #enable root if user is not root
-        enable_root_on_hosts()
+        enable_root(host)
       end
     end
 
@@ -154,8 +169,10 @@ module Beaker
       end
     end
 
-    # Enables root for instances with custom username like ubuntu-amis
-    #
+    # Enables root access for a host when username is not root
+    # This method ripped from the aws_sdk implementation and is probably wrong
+    # because it iterates on a collection when there's no guarantee the collection
+    # has all been brought up in openstack yet and will thus explode
     # @return [void]
     # @api private
     def enable_root_on_hosts
@@ -164,10 +181,8 @@ module Beaker
       end
     end
 
-    # Enables root access for a host when username is not root
-    #
-    # @return [void]
-    # @api private
+    # enable root on a single host (the current one presumably) but only
+    # if the username isn't 'root'
     def enable_root(host)
       if host['user'] != 'root'
         copy_ssh_to_root(host, @options)

data/lib/beaker/hypervisor/vagrant.rb

@@ -46,6 +46,25 @@ module Beaker
           v_file << "    v.vm.synced_folder '.', '/vagrant', :nfs => true\n"
         end
 
+        if /freebsd/i.match(host['platform'])
+          v_file << "    v.ssh.shell = 'sh'\n"
+          v_file << "    v.vm.guest = :freebsd\n"
+
+          # FreeBSD NFS has a character restriction of 88 characters
+          # So you can enable it but if your module has a long name it probably won't work...
+          # So to keep things simple let's rsync by default!
+          #
+          # Further reading if interested:
+          # http://www.secnetix.de/olli/FreeBSD/mnamelen.hawk
+          # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=167105
+          #
+          if host['vagrant_freebsd_nfs'].nil?
+            v_file << "    v.vm.synced_folder '.', '/vagrant', type: 'rsync'\n"
+          else
+            v_file << "    v.vm.synced_folder '.', '/vagrant', :nfs => true\n"
+          end
+        end
+
         v_file << self.class.provider_vfile_section(host, options)
 
         v_file << "  end\n"

data/lib/beaker/network_manager.rb

@@ -129,7 +129,7 @@ module Beaker
       time = Time.new
       stamp = time.strftime('%Y-%m-%d %H:%M:%S')
       verb = create ? '+' : '-'
-      line = "#{stamp}\t[#{verb}]\t#{host['hypervisor']}\t#{host['platform']}\t#{host}"
+      line = "#{stamp}\t[#{verb}]\t#{host['hypervisor']}\t#{host['platform']}\t#{host.log_prefix}"
       sut_logger.notify line
       line
     end

data/lib/beaker/options/presets.rb

@@ -196,6 +196,7 @@ module Beaker
                                      :q_install_update_server                       => 'y',
                                      :q_exit_for_nc_migrate                         => 'n',
                                      :q_enable_future_parser                        => 'n',
+                                     :q_pe_check_for_updates                        => 'n',
           },
           :dot_fog                => File.join(ENV['HOME'], '.fog'),
           :ec2_yaml               => 'config/image_templates/ec2.yaml',

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.9.0'
+    STRING = '2.10.0'
   end
 end

data/spec/beaker/answers_spec.rb

@@ -184,6 +184,14 @@ module Beaker
       @answers = answers.answers
     end
 
+    it 'should add q_pe_check_for_updates to master' do
+      expect( @answers['vm1'][:q_pe_check_for_updates] ).to be === 'n'
+    end
+
+    it 'should add q_pe_check_for_updates to dashboard' do
+      expect( @answers['vm2'][:q_pe_check_for_updates] ).to be === 'n'
+    end
+
     it 'adds :q_enable_future_parser to all hosts, default to "n"' do
       hosts.each do |host|
         expect( basic_hosts[0][:answers][:q_enable_future_parser] ).to be == 'n'
@@ -224,6 +232,18 @@ module Beaker
       end
     end
 
+    it 'should add q_pe_check_for_updates to master' do
+      expect( @answers['vm1'][:q_pe_check_for_updates] ).to be === 'n'
+    end
+
+    it 'should add q_pe_check_for_updates to dashboard' do
+      expect( @answers['vm2'][:q_pe_check_for_updates] ).to be === 'n'
+    end
+
+    it 'should not add q_pe_check_for_updates to agent/database' do
+      expect( @answers['vm3']).to_not include :q_pe_check_for_updates
+    end
+
 # re-enable these tests once these keys are eliminated
 #
 #    it 'should not have q_puppet_enterpriseconsole_database_name key' do
@@ -282,6 +302,18 @@ module Beaker
       @answers = answers.answers
     end
 
+    it 'should add q_pe_check_for_updates to master' do
+      expect( @answers['vm1'][:q_pe_check_for_updates] ).to be === 'n'
+    end
+
+    it 'should add q_pe_check_for_updates to dashboard' do
+      expect( @answers['vm2'][:q_pe_check_for_updates] ).to be === 'n'
+    end
+
+    it 'should not add q_pe_check_for_updates to agent/database' do
+      expect( @answers['vm3']).to_not include :q_pe_check_for_updates
+    end
+
     # The only difference between 3.2 and 3.0 is the addition of the
     # master certname to the dashboard answers
     it 'should add q_puppetmaster_certname to the dashboard answers' do

data/spec/beaker/cli_spec.rb

@@ -91,6 +91,9 @@ module Beaker
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'always'
+          options[:log_dated_dir] = '.'
+          options[:hosts_file] = 'sample.cfg'
+          cli.instance_variable_set(:@hosts, {})
           cli.instance_variable_set(:@options, options)
 
           netmanager = double(:netmanager)
@@ -175,6 +178,9 @@ module Beaker
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'onpass'
+          options[:log_dated_dir] = '.'
+          options[:hosts_file] = 'sample.cfg'
+          cli.instance_variable_set(:@hosts, {})
           cli.instance_variable_set(:@options, options)
 
           netmanager = double(:netmanager)
@@ -184,6 +190,207 @@ module Beaker
           expect{ cli.execute! }.to_not raise_error
         end
       end
+
+      describe 'hosts file saving when preserve_hosts should happen' do
+
+        before :each do
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
+          options = cli.instance_variable_get(:@options)
+          options[:fail_mode] = 'fast'
+          options[:preserve_hosts] = 'onpass'
+          options[:hosts_file] = 'sample.cfg'
+
+          hosts = [
+            { :hypervisor => 'peterPan' },
+            { :hypervisor => 'theMadHatter' },
+          ]
+          cli.instance_variable_set(:@hosts, hosts)
+
+          netmanager = double(:netmanager)
+          cli.instance_variable_set(:@network_manager, netmanager)
+          expect( netmanager ).to receive(:cleanup).never
+
+
+          allow( cli ).to receive( :print_env_vars_affecting_beaker )
+          logger = cli.instance_variable_get(:@logger)
+          expect( logger ).to receive( :send ).with( anything, anything ).ordered
+          expect( logger ).to receive( :send ).with( anything, anything ).ordered
+        end
+
+        it 'executes without error' do
+          options = cli.instance_variable_get(:@options)
+          Dir.mktmpdir do |dir|
+            options[:log_dated_dir] = File.absolute_path(dir)
+
+            expect{ cli.execute! }.to_not raise_error
+          end
+        end
+
+        it 'copies a file into the correct location' do
+          options = cli.instance_variable_get(:@options)
+          Dir.mktmpdir do |dir|
+            options[:log_dated_dir] = File.absolute_path(dir)
+
+            cli.execute!
+
+            copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
+            expect( File.exists?(copied_hosts_file) ).to be_truthy
+          end
+        end
+
+        it 'generates a valid YAML file when it copies' do
+          options = cli.instance_variable_get(:@options)
+          Dir.mktmpdir do |dir|
+            options[:log_dated_dir] = File.absolute_path(dir)
+
+            cli.execute!
+
+            copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
+            expect{ YAML.load_file(copied_hosts_file) }.to_not raise_error
+          end
+        end
+
+        it 'sets the @options :hosts_preserved_yaml_file to the copied file' do
+          options = cli.instance_variable_get(:@options)
+          Dir.mktmpdir do |dir|
+            options[:log_dated_dir] = File.absolute_path(dir)
+
+            expect( options.has_key?(:hosts_preserved_yaml_file) ).to be_falsy
+            cli.execute!
+            expect( options.has_key?(:hosts_preserved_yaml_file) ).to be_truthy
+
+            copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
+            expect( options[:hosts_preserved_yaml_file] ).to be === copied_hosts_file
+          end
+        end
+
+        describe 'output text informing the user that re-use is possible' do
+
+          it 'if unsupported, does not output extra text' do
+            options = cli.instance_variable_get(:@options)
+            Dir.mktmpdir do |dir|
+              options[:log_dated_dir] = File.absolute_path(dir)
+              copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
+
+              logger = cli.instance_variable_get(:@logger)
+              expect( logger ).to receive( :send ).with( anything, "\nYou can re-run commands against the already provisioned SUT(s) by following these steps:\n").never
+              expect( logger ).to receive( :send ).with( anything, "- change the hosts file to #{copied_hosts_file}").never
+              expect( logger ).to receive( :send ).with( anything, '- use the --no-provision flag').never
+
+              cli.execute!
+            end
+          end
+
+          it 'if supported, outputs the text letting the user know they can re-use these hosts' do
+            options = cli.instance_variable_get(:@options)
+            Dir.mktmpdir do |dir|
+              options[:log_dated_dir] = File.absolute_path(dir)
+              copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
+
+              hosts = cli.instance_variable_get(:@hosts)
+              hosts << { :hypervisor => 'fusion' }
+
+              reproducing_cmd = "the faith of the people"
+              allow( cli ).to receive( :build_hosts_preserved_reproducing_command ).and_return( reproducing_cmd )
+
+              logger = cli.instance_variable_get(:@logger)
+              expect( logger ).to receive( :send ).with( anything, "\nYou can re-run commands against the already provisioned SUT(s) with:\n").ordered
+              expect( logger ).to receive( :send ).with( anything, reproducing_cmd).ordered
+
+              cli.execute!
+            end
+          end
+
+          it 'if supported && docker is a hypervisor, outputs text + the untested warning' do
+            options = cli.instance_variable_get(:@options)
+            Dir.mktmpdir do |dir|
+              options[:log_dated_dir] = File.absolute_path(dir)
+              copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
+
+              hosts = cli.instance_variable_get(:@hosts)
+              hosts << { :hypervisor => 'fusion' }
+              hosts << { :hypervisor => 'docker' }
+
+              reproducing_cmd = "the crow flies true says the shoe to you"
+              allow( cli ).to receive( :build_hosts_preserved_reproducing_command ).and_return( reproducing_cmd )
+
+              logger = cli.instance_variable_get(:@logger)
+              expect( logger ).to receive( :send ).with( anything, "\nYou can re-run commands against the already provisioned SUT(s) with:\n").ordered
+              expect( logger ).to receive( :send ).with( anything, '(docker support is untested for this feature. please reference the docs for more info)').ordered
+              expect( logger ).to receive( :send ).with( anything, reproducing_cmd).ordered
+
+              cli.execute!
+            end
+          end
+
+          it 'if unsupported && docker is a hypervisor, no extra text output' do
+            options = cli.instance_variable_get(:@options)
+            Dir.mktmpdir do |dir|
+              options[:log_dated_dir] = File.absolute_path(dir)
+              copied_hosts_file = File.join(File.absolute_path(dir), options[:hosts_file])
+
+              hosts = cli.instance_variable_get(:@hosts)
+              hosts << { :hypervisor => 'docker' }
+
+              logger = cli.instance_variable_get(:@logger)
+              expect( logger ).to receive( :send ).with( anything, "\nYou can re-run commands against the already provisioned SUT(s) with:\n").never
+              expect( logger ).to receive( :send ).with( anything, '(docker support is untested for this feature. please reference the docs for more info)').never
+              expect( logger ).to receive( :send ).with( anything, "- change the hosts file to #{copied_hosts_file}").never
+              expect( logger ).to receive( :send ).with( anything, '- use the --no-provision flag').never
+
+              cli.execute!
+            end
+          end
+
+
+        end
+      end
+      describe '#build_hosts_preserved_reproducing_command' do
+
+        it 'replaces the hosts file' do
+          new_hosts_file  = 'john/deer/was/here.txt'
+          command_to_sub  = 'p --log-level debug --hosts pants/of/plan.poo jam --jankies --flag-business'
+          command_correct = "p --log-level debug --hosts #{new_hosts_file} jam --jankies --flag-business"
+
+          answer = cli.build_hosts_preserved_reproducing_command(command_to_sub, new_hosts_file)
+          expect( answer.start_with?(command_correct) ).to be_truthy
+        end
+
+        it 'doesn\'t replace an entry if no --hosts key is found' do
+          command_to_sub  = 'p --log-level debug johnnypantaloons7 --jankies --flag-business'
+          command_correct = 'p --log-level debug johnnypantaloons7 --jankies --flag-business'
+
+          answer = cli.build_hosts_preserved_reproducing_command(command_to_sub, 'john/deer/plans.txt')
+          expect( answer.start_with?(command_correct) ).to be_truthy
+        end
+
+        it 'removes any old --provision flags' do
+          command_to_sub  = '--provision jam  --provision --jankies --flag-business'
+          command_correct = 'jam --jankies --flag-business'
+
+          answer = cli.build_hosts_preserved_reproducing_command(command_to_sub, 'can/talk/to/pigs.yml')
+          expect( answer.start_with?(command_correct) ).to be_truthy
+        end
+
+        it 'removes any old --no-provision flags' do
+          command_to_sub  = 'jam  --no-provision --jankoos --no-provision --flag-businesses'
+          command_correct = 'jam --jankoos --flag-businesses'
+
+          answer = cli.build_hosts_preserved_reproducing_command(command_to_sub, 'can/talk/to/bears.yml')
+          expect( answer.start_with?(command_correct) ).to be_truthy
+        end
+
+        it 'adds a --no-provision flag to the end of the command' do
+          new_hosts_file  = 'john/deer/was/here.txt'
+          command_to_sub  = 'p --log-level debug johnnypantaloons7 --jankies --flag-business'
+          command_correct = command_to_sub + ' --no-provision'
+
+          answer = cli.build_hosts_preserved_reproducing_command(command_to_sub, new_hosts_file)
+          expect( answer ).to be === command_correct
+        end
+      end
     end
   end
 end