beaker 2.33.0 → 2.34.0

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

@@ -76,4 +76,17 @@ module Windows::Exec
     ssh_service_restart()
   end
 
+  # Gets the specific prepend commands as needed for this host
+  #
+  # @param [String] command Command to be executed
+  # @param [String] user_pc List of user-specified commands to prepend
+  # @param [Hash] opts optional parameters
+  # @option opts [Boolean] :cmd_exe whether cmd.exe should be used
+  #
+  # @return [String] Command string as needed for this host
+  def prepend_commands(command = '', user_pc = nil, opts = {})
+    cygwin_prefix = (self.is_cygwin? and opts[:cmd_exe]) ? 'cmd.exe /c' : ''
+    spacing = (user_pc && !cygwin_prefix.empty?) ? ' ' : ''
+    "#{cygwin_prefix}#{spacing}#{user_pc}"
+  end
 end

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

@@ -5,7 +5,7 @@ module Windows::User
     execute('cmd /c echo "" | wmic useraccount where localaccount="true" get name /format:value') do |result|
       users = []
       result.stdout.each_line do |line|
-        users << (line.match(/^Name=([\w ]+)/) or next)[1]
+        users << (line.match(/^Name=(.+)/) or next)[1]
       end
 
       yield result if block_given?

data/lib/beaker/hypervisor/docker.rb

@@ -81,6 +81,15 @@ module Beaker
           end
         end
 
+        unless host['mount_folders'].nil?
+          container_opts['HostConfig'] ||= {}
+          container_opts['HostConfig']['Binds'] = host['mount_folders'].values.map do |mount|
+            a = [ mount['host_path'], mount['container_path'] ]
+            a << mount['opts'] if mount.has_key?('opts')
+            a.join(':')
+          end
+        end
+
         # If the specified container exists, then use it rather creating a new one
         if container.nil?
           @logger.debug("Creating container from image #{image_name}")

data/lib/beaker/network_manager.rb

@@ -57,7 +57,9 @@ module Beaker
         hypervisor = provision?(@options, host_hash) ? host_hash['hypervisor'] : 'none'
         @logger.debug "Hypervisor for #{name} is #{hypervisor}"
         @machines[hypervisor] = [] unless @machines[hypervisor]
-        @machines[hypervisor] << Beaker::Host.create(name, host_hash, hostless_options)
+        host_itself = Beaker::Host.create(name, host_hash, hostless_options)
+        host_itself.validate_setup
+        @machines[hypervisor] << host_itself
       end
 
       @machines.each_key do |type|

data/lib/beaker/test_case.rb

@@ -136,6 +136,7 @@ module Beaker
             rescue StandardError, ScriptError, SignalException => e
               log_and_fail_test(e)
             ensure
+              @logger.info('Begin teardown')
               @teardown_procs.each do |teardown|
                 begin
                   teardown.call
@@ -143,6 +144,7 @@ module Beaker
                   log_and_fail_test(e)
                 end
               end
+              @logger.info('End teardown')
             end
           end
           @sublog = @logger.get_sublog

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.33.0'
+    STRING = '2.34.0'
   end
 end

data/spec/beaker/command_spec.rb

@@ -6,7 +6,11 @@ module Beaker
     let(:args)    { @args    || Array.new }
     let(:options) { @options || Hash.new  }
     subject(:cmd) { Command.new( command, args, options ) }
-    let(:host)    { Hash.new }
+    let(:host)    {
+      h = Hash.new
+      allow( h ).to receive( :environment_string ).and_return( '' )
+      h
+    }
 
     it 'creates a new Command object' do
       @command = '/usr/bin/blah'
@@ -19,7 +23,6 @@ module Beaker
 
       expect( cmd.args_string    ).to be == 'to the baz'
       expect( cmd.options_string ).to be == '--foo=bar'
-      expect( cmd.environment_string_for(host, cmd.environment) ).to be == ''
 
     end
 
@@ -27,17 +30,19 @@ module Beaker
       it 'can prepend commands' do
         @command = '/usr/bin/blah'
         @args    = [ 'to', 'the', 'baz' ]
-        @options = { :foo => 'bar', :prepend_cmds => 'aloha!' }
+        @options = { :foo => 'bar' }
+        allow( host ).to receive( :prepend_commands ).and_return( 'aloha!' )
 
-        expect( cmd.cmd_line({}) ).to be ==  "aloha! /usr/bin/blah --foo=bar to the baz"
+        expect( cmd.cmd_line( host ) ).to be ==  "aloha! /usr/bin/blah --foo=bar to the baz"
       end
 
       it 'can handle no prepend_cmds' do
         @command = '/usr/bin/blah'
         @args    = [ 'to', 'the', 'baz' ]
-        @options = { :foo => 'bar', :prepend_cmds => nil }
+        @options = { :foo => 'bar' }
+        allow( host ).to receive( :prepend_commands ).and_return( '' )
 
-        expect( cmd.cmd_line({}) ).to be ==  "/usr/bin/blah --foo=bar to the baz"
+        expect( cmd.cmd_line( host ) ).to be ==  "/usr/bin/blah --foo=bar to the baz"
       end
     end
 
@@ -59,26 +64,6 @@ module Beaker
       end
     end
 
-    describe '#environment_string_for' do
-      let(:host) { {'pathseparator' => ':'} }
-
-      it 'returns a blank string if theres no env' do
-        expect( host ).to receive( :is_powershell? ).never
-        expect( subject.environment_string_for(host, {}) ).to be == ''
-      end
-
-      it 'takes an env hash with var_name/value pairs' do
-        expect( host ).to receive( :is_powershell? ).and_return(false)
-        expect( subject.environment_string_for(host, {:HOME => '/'}) ).
-          to be == "env HOME=\"/\""
-      end
-
-      it 'takes an env hash with var_name/value[Array] pairs' do
-        expect( host ).to receive( :is_powershell? ).and_return(false)
-        expect( subject.environment_string_for(host, {:LD_PATH => ['/', '/tmp']}) ).
-          to be == "env LD_PATH=\"/:/tmp\""
-      end
-    end
 
   end
   describe HostCommand do
@@ -102,7 +87,12 @@ module Beaker
     end
   end
   describe SedCommand do
-    let(:host)        { Hash.new }
+    let(:host)        {
+      h = Hash.new
+      allow( h ).to receive( :environment_string ).and_return( '' )
+      allow( h ).to receive( :prepend_commands ).and_return( '' )
+      h
+    }
     let(:platform)    { @platform   || 'unix' }
     let(:expression)  { @expression || 's/b/s/' }
     let(:filename)    { @filename   || '/fakefile' }

data/spec/beaker/dsl/helpers/host_helpers_spec.rb

@@ -50,7 +50,7 @@ describe ClassMixedWithDSLHelpers do
       subject.on( 'master', 'echo hello')
     end
 
-    it 'if the host is a Symbol Object, finds the matching hsots with that Symbol as role' do
+    it 'if the host is a Symbol Object, finds the matching hosts with that Symbol as role' do
       allow( subject ).to receive( :hosts ).and_return( hosts )
 
       expect( master ).to receive( :exec ).once
@@ -157,6 +157,18 @@ describe ClassMixedWithDSLHelpers do
         end
       end
     end
+
+    it 'errors if command is not a String or Beaker::Command' do
+      expect {
+        subject.on( host, Object.new )
+      }.to raise_error( ArgumentError, /called\ with\ a\ String\ or\ Beaker/ )
+    end
+
+    it 'executes the passed Beaker::Command if given as command argument' do
+      command_test = Beaker::Command.new( 'echo face_testing' )
+      expect( master ).to receive( :exec ).with( command_test, anything )
+      subject.on( master, command_test )
+    end
   end
 
   describe "#retry_on" do

data/spec/beaker/dsl/install_utils/foss_utils_spec.rb

@@ -530,27 +530,31 @@ describe ClassMixedWithDSLInstallUtils do
   end
 
   describe 'configure_puppet_on' do
-    before do
-      allow(subject).to receive(:on).and_return(Beaker::Result.new({},''))
-    end
     context 'on debian' do
       let(:platform) { 'debian-7-amd64' }
       let(:host) { make_host('testbox.test.local', :platform => 'debian-7-amd64') }
+
       it 'it sets the puppet.conf file to the provided config' do
         config = { 'main' => {'server' => 'testbox.test.local'} }
-        expect(subject).to receive(:on).with(host, "echo \"[main]\nserver=testbox.test.local\n\n\" > #{host.puppet['config']}")
+        expected_config_string = "[main]\nserver=testbox.test.local\n\n"
+
+        expect( subject ).to receive( :create_remote_file ).with(
+          host, anything, expected_config_string
+        )
         subject.configure_puppet_on(host, config)
       end
     end
     context 'on windows' do
       let(:platform) { 'windows-2008R2-amd64' }
       let(:host) { make_host('testbox.test.local', :platform => 'windows-2008R2-amd64') }
+
       it 'it sets the puppet.conf file to the provided config' do
         config = { 'main' => {'server' => 'testbox.test.local'} }
-        expect(subject).to receive(:on) do |host, command|
-          expect(command.command).to eq('powershell.exe')
-          expect(command.args).to eq(["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command $text = \\\"[main]`nserver=testbox.test.local`n`n\\\"; Set-Content -path '#{host.puppet['config']}' -value $text"])
-        end
+        expected_config_string = "[main]\nserver=testbox.test.local\n\n"
+
+        expect( subject ).to receive( :create_remote_file ).with(
+          host, anything, expected_config_string
+        )
         subject.configure_puppet_on(host, config)
       end
     end
@@ -565,22 +569,27 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive(:hosts).and_return(hosts)
       allow( subject ).to receive(:on).and_return(Beaker::Result.new({},''))
     end
+
     context 'on debian' do
       let(:platform) { 'debian-7-amd64' }
-      it 'it sets the puppet.conf file to the provided config' do
+
+      it 'calls configure_puppet_on correctly' do
         config = { 'main' => {'server' => 'testbox.test.local'} }
-        expect(subject).to receive(:on).with(hosts[0], "echo \"[main]\nserver=testbox.test.local\n\n\" > #{hosts[0].puppet['config']}")
+        expect( subject ).to receive( :configure_puppet_on ).with(
+          anything, config
+        ).exactly( hosts.length ).times
         subject.configure_puppet(config)
       end
     end
+
     context 'on windows' do
       let(:platform) { 'windows-2008R2-amd64' }
-      it 'it sets the puppet.conf file to the provided config' do
+
+      it 'calls configure_puppet_on correctly' do
         config = { 'main' => {'server' => 'testbox.test.local'} }
-        expect(subject).to receive(:on) do |host, command|
-          expect(command.command).to eq('powershell.exe')
-          expect(command.args).to eq(["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command $text = \\\"[main]`nserver=testbox.test.local`n`n\\\"; Set-Content -path '#{host.puppet['config']}' -value $text"])
-        end
+        expect( subject ).to receive( :configure_puppet_on ).with(
+          anything, config
+        ).exactly( hosts.length ).times
         subject.configure_puppet(config)
       end
     end

data/spec/beaker/dsl/install_utils/module_utils_spec.rb

@@ -80,7 +80,7 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :hosts ).and_return( hosts )
       master = hosts.first
 
-
+      allow( subject ).to receive( :on ).once
       expect( subject ).to receive( :puppet ).with('module install test ', {}).once
 
       subject.install_puppet_module_via_pmt_on( master, {:module_name => 'test'} )
@@ -92,6 +92,7 @@ describe ClassMixedWithDSLInstallUtils do
       trace_opts = { :trace => nil }
       master['default_module_install_opts'] = trace_opts
 
+      allow( subject ).to receive( :on ).once
       expect( subject ).to receive( :puppet ).with('module install test ', trace_opts).once
 
       subject.install_puppet_module_via_pmt_on( master, {:module_name => 'test'} )

data/spec/beaker/host/cisco_spec.rb

@@ -0,0 +1,182 @@
+require 'spec_helper'
+
+module Cisco
+  describe Host do
+    let(:options)  { @options ? @options : {} }
+    let(:platform) {
+      if @platform
+        { :platform => Beaker::Platform.new( @platform) }
+      else
+        { :platform => Beaker::Platform.new( 'cisco-vers-arch-extra' ) }
+      end
+    }
+    let(:host)    { make_host( 'name', options.merge(platform) ) }
+
+    describe '#prepend_commands' do
+
+      context 'for cisco-5' do
+
+        before :each do
+          @platform = 'cisco-5-x86'
+        end
+
+        it 'ends with the :vrf host parameter' do
+          vrf_answer = 'vrf_answer_135246'
+          @options = { :vrf => vrf_answer }
+          answer_test = host.prepend_commands( 'fake_command' )
+          expect( answer_test ).to match( /#{vrf_answer}$/ )
+        end
+
+        it 'begins with sourcing the /etc/profile script' do
+          answer_test = host.prepend_commands( 'fake_command' )
+          expect( answer_test ).to match( /^#{Regexp.escape('source /etc/profile; ')}/ )
+        end
+
+        it 'uses sudo at the beginning of the actual command to execute' do
+          answer_test = host.prepend_commands( 'fake_command' )
+          command_start_index = answer_test.index( '; ' ) + 2
+          command_actual = answer_test[command_start_index, answer_test.length - command_start_index]
+          expect( command_actual ).to match( /^sudo / )
+        end
+
+        it 'guards against "vsh" usage (only scenario we dont want prefixing)' do
+          answer_prepend_commands = 'pc_param_unchanged_13584'
+          answer_test = host.prepend_commands( 'fake/vsh/command', answer_prepend_commands )
+          expect( answer_test ).to be === answer_prepend_commands
+        end
+      end
+
+      context 'for cisco-7' do
+
+        before :each do
+          @platform = 'cisco-7-x86'
+        end
+
+        it 'begins with sourcing the /etc/profile script' do
+          answer_test = host.prepend_commands( 'fake_command' )
+          expect( answer_test ).to match( /^#{Regexp.escape('source /etc/profile;')}/ )
+        end
+
+        it 'does not use sudo, as root is allowed' do
+          answer_test = host.prepend_commands( 'fake_command' )
+          expect( answer_test ).not_to match( /sudo/ )
+        end
+
+        it 'does not prepend with the :vrf host parameter' do
+          expect( host ).to receive( :[] ).with( :vrf ).never
+          host.prepend_commands( 'fake_command' )
+        end
+
+      end
+    end
+
+    describe '#environment_string' do
+
+      it 'starts with `env` for cisco-7' do
+        @platform = 'cisco-7-x86'
+        env_map = { 'PATH' => '/opt/pants/1' }
+        answer_test = host.environment_string( env_map )
+        expect( answer_test ).to match( /^env\ / )
+      end
+
+      it 'starts with `export` for cisco-5' do
+        @platform = 'cisco-5-x86'
+        env_map = { 'PATH' => '/opt/pants/2' }
+        answer_test = host.environment_string( env_map )
+        expect( answer_test ).to match( /^export\ / )
+      end
+
+      it 'ends with a semi-colon' do
+        env_map = { 'PATH' => '/opt/pants/3' }
+        answer_test = host.environment_string( env_map )
+        expect( answer_test ).to match( /\;$/ )
+      end
+
+      it 'turns env maps into paired strings correctly' do
+        @platform = 'cisco-7-x86'
+        env_map = { 'var1' => 'ans1', 'var2' => 'ans2' }
+        answer_correct = 'env VAR1="ans1" VAR2="ans2";'
+        answer_test = host.environment_string( env_map )
+        expect( answer_test ).to be === answer_correct
+      end
+    end
+
+    describe '#package_config_dir' do
+
+      it 'returns correctly for cisco platforms' do
+        @platform = 'cisco-5-x86_64'
+        expect( host.package_config_dir ).to be === '/etc/yum/repos.d/'
+      end
+    end
+
+    describe '#repo_type' do
+
+      it 'returns correctly for cisco platforms' do
+        @platform = 'cisco-5-x86_64'
+        expect( host.repo_type ).to be === 'rpm'
+      end
+    end
+
+    describe '#validate_setup' do
+
+      context 'on the cisco-5 platform' do
+        before :each do
+          @platform = 'cisco-5-x86'
+        end
+
+        it 'errors when no :vrf value is provided' do
+          expect {
+            host.validate_setup
+          }.to raise_error( ArgumentError, /provided\ with\ a\ \:vrf\ value/ )
+        end
+
+        it 'errors when no user is provided' do
+          @options = {
+            :vrf  => 'fake_vrf',
+            :user => 'root',
+          }
+          expect {
+            host.validate_setup
+          }.to raise_error( ArgumentError, /provided\ with\ a\ \:user\ value/ )
+        end
+
+        it 'does nothing if the host is setup correctly' do
+          @options = {
+            :vrf  => 'fake_vrf',
+            :user => 'notroot',
+          }
+          validate_test = host.validate_setup
+          expect( validate_test ).to be_nil
+        end
+      end
+
+      context 'on the cisco-7 platform' do
+        before :each do
+          @platform = 'cisco-7-x86'
+        end
+
+        it 'errors when no :vrf value is provided' do
+          expect {
+            host.validate_setup
+          }.to raise_error( ArgumentError, /provided\ with\ a\ \:vrf\ value/ )
+        end
+
+        it 'does not error when no user is provided' do
+          @options = {
+            :vrf  => 'fake_vrf',
+            :user => 'root',
+          }
+          expect {
+            host.validate_setup
+          }.not_to raise_error()
+        end
+
+        it 'does nothing if the host is setup correctly' do
+          @options = { :vrf  => 'fake_vrf' }
+          validate_test = host.validate_setup
+          expect( validate_test ).to be_nil
+        end
+      end
+    end
+  end
+end