beaker 2.5.0 → 2.5.1

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

@@ -2,14 +2,23 @@ module PSWindows::File
   include Beaker::CommandFactory
 
   def tmpfile(name)
-    execute("echo C:\\Windows\\Temp\\#{name}.XXXXXX")
+    execute("echo C:\\Windows\\Temp\\#{name}.%RANDOM%")
   end
 
   def tmpdir(name)
-    execute("echo C:\\Windows\\Temp\\#{name}.XXXXXX")
+    # generate name
+    tmpdirname = execute("echo C:\\Windows\\Temp\\#{name}.%RANDOM%")
+    # created named dir
+    execute("md #{tmpdirname}")
+    tmpdirname
   end
 
   def path_split(paths)
     paths.split(';')
   end
+
+  def file_exist?(path)
+    result = exec(Beaker::Command.new("if exist #{path} echo true"), :acceptable_exit_codes => [0, 1])
+    result.stdout =~ /true/
+  end
 end

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

@@ -7,15 +7,21 @@ module PSWindows::Pkg
   end
 
   def check_for_package(name)
-    raise "Cannot check for package #{name} on #{self}"
+    #HACK NOOP
+    #raise "Cannot check for package #{name} on #{self}"
+    0
   end
 
   def install_package(name, cmdline_args = '')
-    raise "Package #{name} cannot be installed on #{self}"
+    #HACK NOOP
+    #raise "Package #{name} cannot be installed on #{self}"
+    0
   end
 
   def uninstall_package(name, cmdline_args = '')
-    raise "Package #{name} cannot be uninstalled on #{self}"
+    #HACK NOOP
+    #raise "Package #{name} cannot be uninstalled on #{self}"
+    0
   end
 
   private
@@ -23,7 +29,7 @@ module PSWindows::Pkg
   # @api private
   def identify_windows_architecture
     arch = nil
-    execute("echo '' | wmic os get osarchitecture",
+    execute("wmic os get osarchitecture",
     :acceptable_exit_codes => (0...127)) do |result|
 
       arch = if result.exit_code == 0
@@ -38,9 +44,9 @@ module PSWindows::Pkg
   # @api private
   def identify_windows_architecture_from_os_name_for_win2003
     arch = nil
-    execute("echo '' | wmic os get name | grep x64",
+    execute("wmic os get name",
     :acceptable_exit_codes => (0...127)) do |result|
-      arch = result.exit_code == 0 ? '64' : '32'
+      arch = result.stdout =~ /64/ ? '64' : '32'
     end
     arch
   end

data/lib/beaker/host/unix.rb

@@ -61,20 +61,24 @@ module Unix
     end
 
     def self.aio_defaults
-      h = self.foss_defaults
-      h['puppetserver-confdir'] = '/etc/puppetlabs/puppetserver/conf.d'
-      h['puppetservice']  = 'puppetserver'
-      h['puppetbindir']   = '/opt/puppetlabs/agent/bin'
-      h['puppetbin']      = "#{h['puppetbindir']}/puppet"
-      h['puppetpath']     = '/etc/puppetlabs/agent'
-      h['puppetconfdir']  = "#{h['puppetpath']}/config"
-      h['puppetcodedir']  = "#{h['puppetpath']}/code"
-      h['puppetvardir']   = '/opt/puppetlabs/agent/cache'
-      h['distmoduledir']  = "#{h['puppetcodedir']}/modules"
-      h['sitemoduledir']  = '/opt/puppetlabs/agent/modules'
-      h['hieraconf']      = "#{h['puppetcodedir']}/hiera.yaml"
-      h['hieradatadir']   = "#{h['puppetcodedir']}/hieradata"
-      h
+      h = Beaker::Options::OptionsHash.new
+      h.merge({
+        'user'                  => 'root',
+        'group'                 => 'puppet',
+        'puppetserver-confdir'  => '/etc/puppetlabs/puppetserver/conf.d',
+        'puppetservice'         => 'puppetserver',
+        'puppetpath'            => '/etc/puppetlabs/puppet',
+        'puppetconfdir'         => '/etc/puppetlabs/puppet',
+        'puppetvardir'          => '/opt/puppetlabs/puppet/cache',
+        'puppetbin'             => '/opt/puppetlabs/puppet/bin/puppet',
+        'puppetbindir'          => '/opt/puppetlabs/bin',
+        'systembindir'          => '/usr/bin',
+        'hieradatadir'          => '/etc/puppetlabs/code/hieradata',
+        'hieraconf'             => '/etc/puppetlabs/code/hiera.yaml',
+        'distmoduledir'         => '/etc/puppetlabs/code/modules',
+        'sitemoduledir'         => '/opt/puppetlabs/puppet/modules',
+        'pathseparator'         => ':',
+      })
     end
   end
 end

data/lib/beaker/host/windows.rb

@@ -55,7 +55,24 @@ module Windows
     end
 
     def self.aio_defaults
-      self.foss_defaults
+      h = Beaker::Options::OptionsHash.new
+      h.merge({
+        'user'              => 'Administrator',
+        'group'             => 'Administrators',
+        # 'puppetserver-confdir' not applicable on Windows
+        # 'puppetservice' not applicable on Windows
+        'puppetpath'        => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
+        'puppetconfdir'     => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
+        'puppetvardir'      => '`cygpath -smF 35`/PuppetLabs/puppet/cache',
+        # 'puppetbin' not required on Windows
+        'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
+        # systembindir not required on Windows
+        'hieradatadir'      => '`cygpath -smF 35`/Puppetlabs/code/hieradata',
+        'hieraconf'         => '`cygpath -smF 35`/Puppetlabs/code/hiera.yaml',
+        'distmoduledir'     => '`cygpath -smF 35`/PuppetLabs/code/modules',
+        # sitemoduledir not included (check PUP-4049 for more info)
+        'pathseparator'     => ';',
+        })
     end
   end
 end

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

@@ -12,4 +12,9 @@ module Windows::File
   def path_split(paths)
     paths.split(';')
   end
+
+  def file_exist?(path)
+    result = exec(Beaker::Command.new("test -e #{path}"), :acceptable_exit_codes => [0, 1])
+    result.exit_code == 0
+  end
 end

data/lib/beaker/host_prebuilt_steps.rb

@@ -14,6 +14,7 @@ module Beaker
     TRIES = 5
     UNIX_PACKAGES = ['curl', 'ntpdate']
     WINDOWS_PACKAGES = ['curl']
+    PSWINDOWS_PACKAGES = []
     SLES_PACKAGES = ['curl', 'ntp']
     DEBIAN_PACKAGES = ['curl', 'ntpdate', 'lsb-release']
     CUMULUS_PACKAGES = ['addons', 'ntpdate', 'lsb-release']
@@ -76,7 +77,8 @@ module Beaker
     # {HostPrebuiltSteps::SLES_PACKAGES} on SUSE platform hosts,
     # {HostPrebuiltSteps::DEBIAN_PACKAGES} on debian platform hosts,
     # {HostPrebuiltSteps::CUMULUS_PACKAGES} on cumulus platform hosts,
-    # and {HostPrebuiltSteps::WINDOWS_PACKAGES} on windows platform hosts.
+    # {HostPrebuiltSteps::WINDOWS_PACKAGES} on cygwin-installed windows platform hosts,
+    # and {HostPrebuiltSteps::PSWINDOWS_PACKAGES} on non-cygwin windows platform hosts.
     #
     # @param [Host, Array<Host>, String, Symbol] host One or more hosts to act upon
     # @param [Hash{Symbol=>String}] opts Options to alter execution.
@@ -91,8 +93,10 @@ module Beaker
           check_and_install_packages_if_needed(host, DEBIAN_PACKAGES)
         when host['platform'] =~ /cumulus/
           check_and_install_packages_if_needed(host, CUMULUS_PACKAGES)
-        when host['platform'] =~ /windows/
+        when (host['platform'] =~ /windows/ and host.is_cygwin?)
           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'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus/
           check_and_install_packages_if_needed(host, UNIX_PACKAGES)
         end
@@ -296,9 +300,11 @@ module Beaker
       logger = opts[:logger]
       block_on host do |host|
         logger.debug "Give root a copy of current user's keys, on #{host.name}"
-        if host['platform'] =~ /windows/
+        if host['platform'] =~ /windows/ and host.is_cygwin?
           host.exec(Command.new('cp -r .ssh /cygdrive/c/Users/Administrator/.'))
           host.exec(Command.new('chown -R Administrator /cygdrive/c/Users/Administrator/.ssh'))
+        elsif host['platform'] =~ /windows/ and not host.is_cygwin?
+          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})
         else
@@ -433,7 +439,11 @@ module Beaker
     # @param [String] val The string to 'echo' on the host
     def echo_on_host host, val
       #val = val.gsub(/"/, "\"").gsub(/\(/, "\(")
-      host.exec(Command.new("echo \"#{val}\"")).stdout.chomp
+      if host.is_cygwin?
+        host.exec(Command.new("echo \"#{val}\"")).stdout.chomp
+      else
+        host.exec(Command.new("echo #{val}")).stdout.chomp
+      end
     end
 
     # Create the hash of default environment from host (:host_env), global options hash (:host_env) and default PE/Foss puppet variables
@@ -463,7 +473,7 @@ module Beaker
       env['RUBYLIB'].map! { |val| echo_on_host(host, val) }
 
       env.each_key do |key|
-        env[key] = env[key].join(':')
+        env[key] = env[key].join(host['pathseparator'])
       end
       env
     end
@@ -479,10 +489,14 @@ module Beaker
         logger.debug("setting local environment on #{host.name}")
         case host['platform']
         when /windows/
-          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/sshd_config"))
-          host.exec(Command.new("cygrunsrv -E sshd"))
-          host.exec(Command.new("cygrunsrv -S sshd"))
-          env['CYGWIN'] = 'nodosfilewarning'
+          if host.is_cygwin?
+            host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/sshd_config"))
+            host.exec(Command.new("cygrunsrv -E sshd"))
+            host.exec(Command.new("cygrunsrv -S sshd"))
+            env['CYGWIN'] = 'nodosfilewarning'
+          else
+            #nothing to do here
+          end
         when /osx/
           host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/sshd_config"))
           host.exec(Command.new("launchctl unload /System/Library/LaunchDaemons/ssh.plist"))
@@ -505,22 +519,30 @@ module Beaker
           host.exec(Command.new("startsrc -g ssh"))
         end
 
-        #ensure that ~/.ssh/environment exists
-        host.exec(Command.new("mkdir -p #{Pathname.new(host[:ssh_env_file]).dirname}"))
-        host.exec(Command.new("chmod 0600 #{Pathname.new(host[:ssh_env_file]).dirname}"))
-        host.exec(Command.new("touch #{host[:ssh_env_file]}"))
-
-        #add the constructed env vars to this host
-        host.add_env_var('RUBYLIB', '$RUBYLIB')
-        host.add_env_var('PATH', '$PATH')
+        if host['platform'] !~ /windows/ or (host['platform'] =~ /windows/ and host.is_cygwin?)
+          #ensure that ~/.ssh/environment exists
+          host.exec(Command.new("mkdir -p #{Pathname.new(host[:ssh_env_file]).dirname}"))
+          host.exec(Command.new("chmod 0600 #{Pathname.new(host[:ssh_env_file]).dirname}"))
+          host.exec(Command.new("touch #{host[:ssh_env_file]}"))
+          #add the constructed env vars to this host
+          host.add_env_var('RUBYLIB', '$RUBYLIB')
+          host.add_env_var('PATH', '$PATH')
+        end
+        #add the env var set to this test host
         env.each_pair do |var, value|
           host.add_env_var(var, value)
         end
 
-        host.exec(Command.new("cat #{host[:ssh_env_file]}"))
-
         #close the host to re-establish the connection with the new sshd settings
         host.close
+
+        # print out the working env
+        if host.is_cygwin?
+          host.exec(Command.new("cat #{host[:ssh_env_file]}"))
+        else
+          host.exec(Command.new("SET"))
+        end
+
       end
     end
 

data/lib/beaker/hypervisor.rb

@@ -110,7 +110,9 @@ module Beaker
       if @options[:disable_iptables]
         disable_iptables @hosts, @options
       end
-      set_env(@hosts, @options)
+      if @options[:set_env]
+        set_env(@hosts, @options)
+      end
     end
 
     #Default validation steps to be run for a given hypervisor.  Ensures that SUTs meet requirements to be

data/lib/beaker/hypervisor/docker.rb

@@ -119,15 +119,15 @@ module Beaker
       sshd_options = ''
 
       # add platform-specific actions
+      service_name = "sshd"
       case host['platform']
       when /ubuntu/, /debian/
-        sshd_options = '-o "PermitRootLogin yes" -o "PasswordAuthentication yes"'
+        service_name = "ssh"
         dockerfile += <<-EOF
           RUN apt-get update
           RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES.join(' ')}
         EOF
         when  /cumulus/
-          sshd_options = '-o "PermitRootLogin yes" -o "PasswordAuthentication yes"'
           dockerfile += <<-EOF
           RUN apt-get update
           RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES.join(' ')}
@@ -140,11 +140,11 @@ module Beaker
           RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
         EOF
       when /opensuse/, /sles/
-        sshd_options = '-o "PermitRootLogin yes" -o "PasswordAuthentication yes" -o "UsePAM no"'
         dockerfile += <<-EOF
           RUN zypper -n in openssh #{Beaker::HostPrebuiltSteps::SLES_PACKAGES.join(' ')}
           RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
           RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
+          RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
         EOF
       else
         # TODO add more platform steps here
@@ -157,6 +157,13 @@ module Beaker
         RUN echo root:#{root_password} | chpasswd
       EOF
 
+      # Configure sshd service to allowroot login using password
+      dockerfile += <<-EOF
+        RUN sed -ri 's/^#?PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config
+        RUN sed -ri 's/^#?PasswordAuthentication .*/PasswordAuthentication yes/' /etc/ssh/sshd_config
+      EOF
+
+
       # Any extra commands specified for the host
       dockerfile += (host['docker_image_commands'] || []).map { |command|
         "RUN #{command}\n"
@@ -168,7 +175,8 @@ module Beaker
       end
 
       # How to start a sshd on port 22.  May be an init for more supervision
-      cmd = host['docker_cmd'] || "/usr/sbin/sshd -D #{sshd_options}"
+      # Ensure that the ssh server can be restarted (done from set_env) and container keeps running
+      cmd = host['docker_cmd'] || ["sh","-c","service #{service_name} start ; tail -f /dev/null"]
       dockerfile += <<-EOF
         EXPOSE 22
         CMD #{cmd}

data/lib/beaker/hypervisor/openstack.rb

@@ -44,7 +44,8 @@ module Beaker
         :provider => :openstack,
         :openstack_api_key => @options[:openstack_api_key],
         :openstack_username => @options[:openstack_username],
-        :openstack_auth_url => @options[:openstack_auth_url])
+        :openstack_auth_url => @options[:openstack_auth_url],
+        :openstack_tenant => @options[:openstack_tenant])
       if not @network_client
 
         raise "Unable to create OpenStack Network instance (api_key: #{@options[:openstack_api_key]}, username: #{@options[:openstack_username]}, auth_url: #{@options[:openstack_auth_url]}, tenant: #{@options[:openstack_tenant]})"
@@ -88,10 +89,7 @@ module Beaker
           :nics => [ {'net_id' => network(@options[:openstack_network]).id } ],
           :name => host[:vmhostname],
         }
-        if @options[:openstack_keyname]
-          @logger.debug "Adding optional key_name #{@options[:openstack_keyname]} to #{host.name} (#{host[:vmhostname]})"
-          options[:key_name] = @options[:openstack_keyname]
-        end
+        options[:key_name] = key_name(host)
         vm = @compute_client.servers.create(options)
 
         #wait for the new instance to start up
@@ -149,6 +147,10 @@ module Beaker
         end
         @logger.debug "Destroying OpenStack host #{vm.name}"
         vm.destroy
+        if @options[:openstack_keyname].nil?
+          @logger.debug "Deleting random keypair"
+          @compute_client.delete_key_pair vm.name
+        end
       end
     end
 
@@ -175,5 +177,26 @@ module Beaker
       end
     end
 
+    #Get key_name from options or generate a new rsa key and add it to
+    #OpenStack keypairs
+    #
+    #@param [Host] host The OpenStack host to provision
+    #@return [String] key_name
+    #@api private
+    def key_name(host)
+      if @options[:openstack_keyname]
+        @logger.debug "Adding optional key_name #{@options[:openstack_keyname]} to #{host.name} (#{host[:vmhostname]})"
+        @options[:openstack_keyname]
+      else
+        @logger.debug "Generate a new rsa key"
+        key = OpenSSL::PKey::RSA.new 2048
+        type = key.ssh_type
+        data = [ key.to_blob ].pack('m0')
+        @logger.debug "Creating Openstack keypair for public key '#{type} #{data}'"
+        @compute_client.create_key_pair host[:vmhostname], "#{type} #{data}"
+        host['ssh'][:key_data] = [ key.to_pem ]
+        host[:vmhostname]
+      end
+    end
   end
 end

data/lib/beaker/options/presets.rb

@@ -143,6 +143,7 @@ module Beaker
           :accept_all_exit_codes  => false,
           :timesync               => false,
           :disable_iptables       => false,
+          :set_env                => true,
           :repo_proxy             => false,
           :package_proxy          => false,
           :add_el_extras          => false,

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.5.0'
+    STRING = '2.5.1'
   end
 end

data/spec/beaker/dsl/helpers_spec.rb

@@ -258,7 +258,19 @@ describe ClassMixedWithDSLHelpers do
     end
   end
 
-  describe '#create_remote_file' do
+  describe '#rsync_to' do
+    it 'delegates to the host' do
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+
+      hosts.each do |host|
+        expect( host ).to receive( :do_rsync_to ).and_return( result )
+      end
+
+      subject.rsync_to( hosts, '/var/log/my.log', 'log/my.log' )
+    end
+  end
+
+  describe '#create_remote_file using scp' do
     it 'scps the contents passed in to the hosts' do
       my_opts = { :silent => true }
       tmpfile = double
@@ -277,6 +289,25 @@ describe ClassMixedWithDSLHelpers do
     end
   end
 
+  describe '#create_remote_file using rsync' do
+    it 'scps the contents passed in to the hosts' do
+      my_opts = { :silent => true, :protocol => 'rsync' }
+      tmpfile = double
+
+      expect( tmpfile ).to receive( :path ).exactly( 2 ).times.
+        and_return( '/local/path/to/blah' )
+
+      expect( Tempfile ).to receive( :open ).and_yield( tmpfile )
+
+      expect( File ).to receive( :open )
+
+      expect( subject ).to receive( :rsync_to ).
+        with( hosts, '/local/path/to/blah', '/remote/path', my_opts )
+
+      subject.create_remote_file( hosts, '/remote/path', 'blah', my_opts )
+    end
+  end
+
   describe '#create_tmpdir_for_user' do
     let(:host) { {} }
     let(:result) { double.as_null_object }
@@ -784,12 +815,6 @@ describe ClassMixedWithDSLHelpers do
     let( :result_pass ) { Beaker::Result.new( [], "" ) }
     before :each do
       allow( subject ).to receive( :sleep ).and_return( true )
-      result_fail.stdout = 'stdout'
-      result_fail.stderr = 'stderr'
-      result_fail.exit_code = 1
-      result_pass.stdout = 'stdout'
-      result_pass.stderr = 'stderr'
-      result_pass.exit_code = 0
     end
 
     it 'runs the pe-puppet on a system without pe-puppet-agent' do
@@ -797,9 +822,9 @@ describe ClassMixedWithDSLHelpers do
       deb_agent = make_host( 'deb', :platform => 'debian-7-amd64' )
       allow( deb_agent ).to receive( :puppet ).and_return( { 'vardir' => vardir } )
 
-      allow( subject ).to receive( :hosts ).and_return( hosts )
-      expect( subject ).to receive( :on ).with( deb_agent, "[ -e '#{vardir}/state/agent_catalog_run.lock' ]", :acceptable_exit_codes => [0,1] ).once.and_return( result_fail )
-      expect( subject ).to receive( :on ).with( deb_agent, "[ -e /etc/init.d/pe-puppet-agent ]", :acceptable_exit_codes => [0,1] ).once.and_return( result_fail )
+      expect( deb_agent ).to receive( :file_exist? ).with("/var/state/agent_catalog_run.lock").and_return(false)
+      expect( deb_agent ).to receive( :file_exist? ).with("/etc/init.d/pe-puppet-agent").and_return(false)
+
       expect( subject ).to receive( :puppet_resource ).with( "service", "pe-puppet", "ensure=stopped").once
       expect( subject ).to receive( :on ).once
 
@@ -812,10 +837,10 @@ describe ClassMixedWithDSLHelpers do
       el_agent = make_host( 'el', :platform => 'el-5-x86_64' )
       allow( el_agent ).to receive( :puppet ).and_return( { 'vardir' => vardir } )
 
-      allow( subject ).to receive( :hosts ).and_return( hosts )
-      expect( subject ).to receive( :on ).with( el_agent, "[ -e '#{vardir}/state/agent_catalog_run.lock' ]", :acceptable_exit_codes => [0,1] ).once.and_return( result_fail )
-      expect( subject ).to receive( :on ).with( el_agent, "[ -e /etc/init.d/pe-puppet-agent ]", :acceptable_exit_codes => [0,1] ).once.and_return( result_pass )
-      expect( subject ).to receive( :puppet_resource ).with("service", "pe-puppet-agent", "ensure=stopped").once
+      expect( el_agent ).to receive( :file_exist? ).with("/var/state/agent_catalog_run.lock").and_return(false)
+      expect( el_agent ).to receive( :file_exist? ).with("/etc/init.d/pe-puppet-agent").and_return(true)
+
+      expect( subject ).to receive( :puppet_resource ).with( "service", "pe-puppet-agent", "ensure=stopped").once
       expect( subject ).to receive( :on ).once
 
       subject.stop_agent_on( el_agent )
@@ -916,6 +941,12 @@ describe ClassMixedWithDSLHelpers do
       }.to raise_error(RuntimeError, /puppet conf backup failed/)
     end
 
+    it 'receives a Minitest::Assertion and fails the test correctly' do
+      allow( subject ).to receive( :backup_the_file ).and_raise( Minitest::Assertion.new('assertion failed!') )
+      expect( subject ).to receive( :fail_test )
+      subject.with_puppet_running_on(host, {})
+    end
+
     describe 'with puppet-server' do
       let(:default_confdir) { "/etc/puppet" }
       let(:default_vardir) { "/var/lib/puppet" }
@@ -958,8 +989,11 @@ describe ClassMixedWithDSLHelpers do
         stub_post_setup
         allow( subject ).to receive( :options) .and_return( {:is_puppetserver => true})
         allow( subject ).to receive( :modify_tk_config)
-        allow( host ).to receive(:puppet).with('master') .and_return({'confdir' => default_confdir,
-                                                       'vardir' => default_vardir})
+        allow( host ).to receive(:puppet).with( any_args ).and_return({
+          'confdir' => default_confdir,
+          'vardir' => default_vardir,
+          'config' => "#{default_confdir}/puppet.conf"
+        })
       end
 
       describe 'and command line args passed' do
@@ -1087,7 +1121,7 @@ describe ClassMixedWithDSLHelpers do
             execution = 0
             expect do
               subject.with_puppet_running_on(host, {}) do
-                expect(host).to execute_commands_matching(/^puppet master/).once
+                expect(host).to execute_commands_matching(/^puppet master/).exactly(4).times
                 execution += 1
               end
             end.to change { execution }.by(1)
@@ -1103,9 +1137,22 @@ describe ClassMixedWithDSLHelpers do
       end
 
       describe 'backup and restore of puppet.conf' do
-        let(:original_location) { "#{host['puppetpath']}/puppet.conf" }
-        let(:backup_location) { "#{tmpdir_path}/puppet.conf.bak" }
-        let(:new_location) { "#{tmpdir_path}/puppet.conf" }
+        before :each do
+          mock_puppetconf_reader = Object.new
+          allow( mock_puppetconf_reader ).to receive( :[] ).with( 'config' ).and_return( '/root/mock/puppet.conf' )
+          allow( mock_puppetconf_reader ).to receive( :[] ).with( 'confdir' ).and_return( '/root/mock' )
+          allow( host ).to receive( :puppet ).with( any_args ).and_return( mock_puppetconf_reader )
+        end
+
+        let(:original_location) { host.puppet['config'] }
+        let(:backup_location) {
+          filename = File.basename(host.puppet['config'])
+          File.join(tmpdir_path, "#{filename}.bak")
+        }
+        let(:new_location) {
+          filename = File.basename(host.puppet['config'])
+          File.join(tmpdir_path, filename)
+        }
 
         context 'when a puppetservice is used' do
           let(:use_service) { true }
@@ -1299,13 +1346,13 @@ describe ClassMixedWithDSLHelpers do
     let(:hierarchy) { [ 'nodes/%{::fqdn}', 'common' ] }
     it 'on FOSS host' do
       host = make_host('testhost', { :platform => 'ubuntu' } )
-      expect(subject).to receive(:create_remote_file).with(host, host[:hieraconf], /#{host[:hieradatadir]}/)
+      expect(subject).to receive(:create_remote_file).with(host, host.puppet['hiera_config'], /#{host[:hieradatadir]}/)
       subject.write_hiera_config_on(host, hierarchy)
     end
 
     it 'on PE host' do
       host = make_host('testhost', { :platform => 'ubuntu', :type => 'pe' } )
-      expect(subject).to receive(:create_remote_file).with(host, host[:hieraconf], /#{host[:hieradatadir]}/)
+      expect(subject).to receive(:create_remote_file).with(host, host.puppet['hiera_config'], /#{host[:hieradatadir]}/)
       subject.write_hiera_config_on(host, hierarchy)
     end