beaker 2.3.0 → 2.4.0

data/spec/beaker/dsl/install_utils_spec.rb

@@ -547,14 +547,15 @@ describe ClassMixedWithDSLInstallUtils do
       let(:platform) { "windows-2008r2-i386" }
       it 'installs specific version of puppet when passed :version' do
         allow(subject).to receive(:link_exists?).and_return( true )
-        expect(subject).to receive(:on).with(hosts[0], 'curl -O http://downloads.puppetlabs.com/windows/puppet-3000.msi')
-        expect(subject).to receive(:on).with(hosts[0], 'msiexec /qn /i puppet-3000.msi')
+        expect(subject).to receive(:on).with(hosts[0], 'curl -O /cygdrive/c/Windows/Temp/puppet-3000.msi http://downloads.puppetlabs.com/windows/puppet-3000.msi')
+        expect(subject).to receive(:on).with(hosts[0], " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
+        expect(subject).to receive(:on).with(hosts[0], 'msiexec /qn /i /cygdrive/c/Windows/Temp/puppet-3000.msi')
         subject.install_puppet(:version => '3000')
       end
       it 'installs from custom url when passed :win_download_url' do
         allow(subject).to receive(:link_exists?).and_return( true )
-        expect(subject).to receive(:on).with(hosts[0], 'curl -O http://nightlies.puppetlabs.com/puppet-latest/repos/windows/puppet-3000.msi')
-        expect(subject).to receive(:on).with(hosts[0], 'msiexec /qn /i puppet-3000.msi')
+        expect(subject).to receive(:on).with(hosts[0], 'curl -O /cygdrive/c/Windows/Temp/puppet-3000.msi http://nightlies.puppetlabs.com/puppet-latest/repos/windows/puppet-3000.msi')
+        expect(subject).to receive(:on).with(hosts[0], 'msiexec /qn /i /cygdrive/c/Windows/Temp/puppet-3000.msi')
         subject.install_puppet( :version => '3000', :win_download_url => 'http://nightlies.puppetlabs.com/puppet-latest/repos/windows' )
       end
     end

data/spec/beaker/dsl/structure_spec.rb

@@ -5,7 +5,8 @@ class ClassMixedWithDSLStructure
 end
 
 describe ClassMixedWithDSLStructure do
-  let(:logger) { Object.new }
+  include Beaker::DSL::Assertions
+  let(:logger) { double }
   describe '#step' do
     it 'requires a name' do
       expect { subject.step do; end }.to raise_error ArgumentError
@@ -57,4 +58,30 @@ describe ClassMixedWithDSLStructure do
       subject.teardown &block
     end
   end
+
+  describe '#expect_failure' do
+    it 'passes when a MiniTest assertion is raised' do
+      expect( subject ).to receive( :logger ).and_return( logger )
+      expect( logger ).to receive( :notify )
+      block = lambda { assert_equal('1', '2', '1 should not equal 2') }
+      expect{ subject.expect_failure 'this is an expected failure', &block }.to_not raise_error
+    end
+
+    it 'passes when a Beaker assertion is raised' do
+      expect( subject ).to receive( :logger ).and_return( logger )
+      expect( logger ).to receive( :notify )
+      block = lambda { assert_no_match('1', '1', '1 and 1 should not match') }
+      expect{ subject.expect_failure 'this is an expected failure', &block }.to_not raise_error
+    end
+
+    it 'fails when a non-Beaker, non-MiniTest assertion is raised' do
+      block = lambda { raise 'not a Beaker or MiniTest error' }
+      expect{ subject.expect_failure 'this has a non-Beaker, non-MiniTest exception', &block }.to raise_error(RuntimeError, /not a Beaker or MiniTest error/)
+    end
+
+    it 'fails when no assertion is raised' do
+      block = lambda { assert_equal('1', '1', '1 should equal 1') }
+      expect{ subject.expect_failure 'this has no failure', &block }.to raise_error(RuntimeError, /An assertion was expected to fail, but passed/)
+    end
+  end
 end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -513,13 +513,14 @@ describe Beaker do
       expect( Beaker::Command ).to receive( :new ).with( "mkdir -p #{Pathname.new(host[:ssh_env_file]).dirname}" ).once
       expect( Beaker::Command ).to receive( :new ).with( "chmod 0600 #{Pathname.new(host[:ssh_env_file]).dirname}" ).once
       expect( Beaker::Command ).to receive( :new ).with( "touch #{host[:ssh_env_file]}" ).once
+      expect( Beaker::Command ).to receive( :new ).with( "cat #{host[:ssh_env_file]}" ).once
       expect( host ).to receive( :add_env_var ).with( 'RUBYLIB', '$RUBYLIB' ).once
       expect( host ).to receive( :add_env_var ).with( 'PATH', '$PATH' ).once
       opts.each_pair do |key, value|
         expect( host ).to receive( :add_env_var ).with( key, value ).once
       end
       expect( host ).to receive( :add_env_var ).with( 'CYGWIN', 'nodosfilewarning' ).once if platform_name =~ /windows/
-      expect( host ).to receive( :exec ).exactly( host_specific_commands_array.length + 3 ).times
+      expect( host ).to receive( :exec ).exactly( host_specific_commands_array.length + 4 ).times
 
       subject.set_env(host, options.merge( opts ))
     end

data/spec/beaker/host_spec.rb

@@ -64,16 +64,10 @@ module Beaker
         expect(host.is_using_passenger?).to be_falsy
       end
 
-      it 'sets the paths correctly for an AIO agent host' do
+      it 'sets the paths correctly for an AIO host' do
         options['type'] = 'aio'
         expect(host['puppetvardir']).to be === Unix::Host::aio_defaults[:puppetvardir]
       end
-
-      it 'sets the paths correctly for an AIO non-agent host' do
-        options['type'] = 'aio'
-        options['roles'] = ['master']
-        expect(host['puppetvardir']).to be === Unix::Host::foss_defaults[:puppetvardir]
-      end
     end
 
     describe "uses_passenger!" do

data/spec/beaker/hypervisor/docker_spec.rb

@@ -67,13 +67,26 @@ module Beaker
       allow( ::Docker ).to receive(:options).and_return(docker_options)
       allow( ::Docker ).to receive(:options=)
       allow( ::Docker ).to receive(:logger=)
-      allow( ::Docker ).to receive(:validate_version!)
       allow( ::Docker::Image ).to receive(:build).and_return(image)
       allow( ::Docker::Container ).to receive(:create).and_return(container)
       allow_any_instance_of( ::Docker::Container ).to receive(:start)
     end
 
+    describe '#initialize, failure to validate' do
+      before :each do
+        require 'excon'
+        allow( ::Docker ).to receive(:validate_version!).and_raise(Excon::Errors::SocketError.new( StandardError.new('oops') ))
+      end
+      it 'should fail when docker not present' do
+        expect { docker }.to raise_error(RuntimeError, /Docker instance not found/)
+      end
+    end
+
     describe '#initialize' do
+      before :each do
+        allow( ::Docker ).to receive(:validate_version!)
+      end
+
       it 'should require the docker gem' do
         expect_any_instance_of( ::Beaker::Docker ).to receive(:require).with('docker').once
 
@@ -116,6 +129,7 @@ module Beaker
 
     describe '#provision' do
       before :each do
+        allow( ::Docker ).to receive(:validate_version!)
         allow( docker ).to receive(:dockerfile_for)
       end
 
@@ -195,6 +209,7 @@ module Beaker
     describe '#cleanup' do
       before :each do
         # get into a state where there's something to clean
+        allow( ::Docker ).to receive(:validate_version!)
         allow( docker ).to receive(:dockerfile_for)
         docker.provision
       end
@@ -238,6 +253,9 @@ module Beaker
     end
 
     describe '#dockerfile_for' do
+      before :each do
+        allow( ::Docker ).to receive(:validate_version!)
+      end
       it 'should raise on an unsupported platform' do
         expect { docker.send(:dockerfile_for, {'platform' => 'a_sidewalk' }) }.to raise_error(/platform a_sidewalk not yet supported on docker/)
       end

data/spec/beaker/hypervisor/vagrant_parallels_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Beaker::VagrantParallels do
+  let( :options ) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double().as_null_object }) }
+  let( :vagrant ) { Beaker::VagrantParallels.new( @hosts, options ) }
+
+  before :each do
+    @hosts = make_hosts()
+  end
+
+  it "uses the parallels provider for provisioning" do
+    @hosts.each do |host|
+      host_prev_name = host['user']
+      expect( vagrant ).to receive( :set_ssh_config ).with( host, 'vagrant' ).once
+      expect( vagrant ).to receive( :copy_ssh_to_root ).with( host, options ).once
+      expect( vagrant ).to receive( :set_ssh_config ).with( host, host_prev_name ).once
+    end
+    expect( vagrant ).to receive( :hack_etc_hosts ).with( @hosts, options ).once
+    expect( vagrant ).to receive( :vagrant_cmd ).with( "up --provider parallels" ).once
+    vagrant.provision
+  end
+
+  it "can make a Vagranfile for a set of hosts" do
+    path = vagrant.instance_variable_get( :@vagrant_path )
+    allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
+
+    vagrant.make_vfile( @hosts )
+
+    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
+    expect( vagrantfile ).to include( %Q{    v.vm.provider :parallels do |prl|\n      prl.optimize_power_consumption = false\n      prl.memory = '1024'\n    end})
+  end
+
+  it "can disable the auto-update functionality of the Parallels Guest Tools" do
+    options.merge!({ :prl_update_guest_tools => 'disable' })
+
+    vfile_section = vagrant.class.provider_vfile_section( @hosts.first, options )
+
+    match = vfile_section.match(/prl.update_guest_tools = false/)
+
+    expect( match ).to_not be nil
+
+  end
+
+end

data/spec/beaker/logger_junit_spec.rb

@@ -0,0 +1,93 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+module Beaker
+  describe LoggerJunit do
+    let( :xml_file ) { '/fake/file/location1' }
+    let( :stylesheet ) { '/fake/file/location2' }
+
+    describe '#is_valid_xml' do
+
+      it 'rejects all invalid values' do
+        invalid_values = [0x8, 0x10, 0xB, 0x0019, 0xD800, 0xDFFF, 0xFFFE, 0x99999, 0x110000]
+        invalid_values.each do |value|
+          expect( LoggerJunit.is_valid_xml(value) ).to be === false
+        end
+      end
+
+      it 'accepts valid values' do
+        valid_values = [0x9, 0xA, 0x0020, 0xD7FF, 0xE000, 0xFFFD, 0x100000, 0x10FFFF]
+        valid_values.each do |value|
+          expect( LoggerJunit.is_valid_xml(value) ).to be === true
+        end
+      end
+
+    end
+
+    describe '#escape_invalid_xml_chars' do
+
+      it 'escapes invalid xml characters correctly' do
+        testing_string = 'pants'
+        testing_string << 0x8
+        expect( LoggerJunit.escape_invalid_xml_chars(testing_string) ).to be === 'pants\8'
+      end
+
+      it 'leaves a string of all valid xml characters alone' do
+        testing_string = 'pants man, pants!'
+        expect( LoggerJunit.escape_invalid_xml_chars(testing_string) ).to be === testing_string
+      end
+
+    end
+
+    describe '#copy_stylesheet_into_xml_dir' do
+
+      it 'copies the stylesheet into the correct location' do
+        allow( File ).to receive( :file? ) { false }
+        correct_location = File.join(File.dirname(xml_file), File.basename(stylesheet))
+        expect( FileUtils ).to receive( :copy ).with( stylesheet, correct_location )
+        LoggerJunit.copy_stylesheet_into_xml_dir(stylesheet, xml_file)
+      end
+
+      it 'skips action if the file doesn\'t exist' do
+        allow( File ).to receive( :file? ) { true }
+        expect( FileUtils ).not_to receive( :copy )
+        LoggerJunit.copy_stylesheet_into_xml_dir(stylesheet, xml_file)
+      end
+
+    end
+
+    describe '#finish' do
+
+      it 'opens the given file for writing, and writes the doc to it' do
+        mock_doc = Object.new
+        doc_xml = 'flibbity-floo'
+        allow( mock_doc ).to receive( :to_xml ) { doc_xml }
+        mock_file_handle = Object.new
+        expect( mock_file_handle ).to receive( :write ).with( doc_xml )
+        expect( File ).to receive( :open ).with( xml_file, 'w' ).and_yield( mock_file_handle )
+        LoggerJunit.finish(mock_doc, xml_file)
+      end
+
+    end
+
+    describe '#write_xml' do
+
+      it 'throws an error with 1-arity in the given block' do
+        allow( LoggerJunit ).to receive( :get_xml_contents )
+        expect{ LoggerJunit.write_xml(xml_file, stylesheet) do |hey| end }.to raise_error(ArgumentError)
+      end
+
+      it 'doesn\'t throw an error with 2-arity in the given block' do
+        allow( LoggerJunit ).to receive( :get_xml_contents )
+        allow( LoggerJunit ).to receive( :finish )
+        expect{ LoggerJunit.write_xml(xml_file, stylesheet) do |hey1, hey2| end }.not_to raise_error
+      end
+
+      it 'throws an error with 3-arity in the given block' do
+        allow( LoggerJunit ).to receive( :get_xml_contents )
+        expect{ LoggerJunit.write_xml(xml_file, stylesheet) do |hey1, hey2, hey3| end }.to raise_error(ArgumentError)
+      end
+
+    end
+  end
+end

data/spec/beaker/network_manager_spec.rb

@@ -0,0 +1,52 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+module Beaker
+  describe NetworkManager do
+    let( :mock_provisioning_logger ) {
+      mock_provisioning_logger = Object.new
+      allow( mock_provisioning_logger ).to receive( :notify )
+      mock_provisioning_logger }
+    let( :options ) { make_opts.merge({ 'logger' => double().as_null_object, :logger_sut => mock_provisioning_logger }) }
+    let( :network_manager ) { NetworkManager.new(options, options[:logger]) }
+    let( :hosts ) { make_hosts }
+    let( :host ) { hosts[0] }
+
+    describe '#log_sut_event' do
+
+      it 'creates the correct content for an event' do
+        log_line = network_manager.log_sut_event host, true
+        pieces = log_line.split("\t")
+        hypervisor_value = host['hypervisor'] ? host['hypervisor'] : ''
+        platform_value = host['platform'] ? host['platform'] : ''
+        expect( pieces[1] ).to be === '[+]'
+        expect( pieces[2] ).to be === hypervisor_value
+        expect( pieces[3] ).to be === platform_value
+        expect( pieces[4] ).to be === host.name
+      end
+
+      it 'follows the create parameter correctly' do
+        log_line = network_manager.log_sut_event host, true
+        pieces = log_line.split("\t")
+        expect( pieces[1] ).to be === '[+]'
+
+        log_line = network_manager.log_sut_event host, false
+        pieces = log_line.split("\t")
+        expect( pieces[1] ).to be === '[-]'
+      end
+
+      it 'sends the log line to the provisioning logger' do
+        nm = network_manager
+        options[:logger_sut] = mock_provisioning_logger
+        expect( mock_provisioning_logger ).to receive( :notify ).once
+        nm.log_sut_event host, true
+      end
+
+      it 'throws an error if the provisioning logger hasn\'t been created yet' do
+        nm = network_manager
+        options.delete(:logger_sut)
+        expect{ nm.log_sut_event(host, true) }.to raise_error(ArgumentError)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -362,6 +362,7 @@ files:
 - lib/beaker/answers/version30.rb
 - lib/beaker/answers/version32.rb
 - lib/beaker/answers/version34.rb
+- lib/beaker/answers/version40.rb
 - lib/beaker/cli.rb
 - lib/beaker/command.rb
 - lib/beaker/command_factory.rb
@@ -384,6 +385,12 @@ files:
 - lib/beaker/host/mac.rb
 - lib/beaker/host/mac/group.rb
 - lib/beaker/host/mac/user.rb
+- lib/beaker/host/pswindows.rb
+- lib/beaker/host/pswindows/exec.rb
+- lib/beaker/host/pswindows/file.rb
+- lib/beaker/host/pswindows/group.rb
+- lib/beaker/host/pswindows/pkg.rb
+- lib/beaker/host/pswindows/user.rb
 - lib/beaker/host/unix.rb
 - lib/beaker/host/unix/exec.rb
 - lib/beaker/host/unix/file.rb
@@ -410,6 +417,7 @@ files:
 - lib/beaker/hypervisor/vagrant.rb
 - lib/beaker/hypervisor/vagrant_fusion.rb
 - lib/beaker/hypervisor/vagrant_libvirt.rb
+- lib/beaker/hypervisor/vagrant_parallels.rb
 - lib/beaker/hypervisor/vagrant_virtualbox.rb
 - lib/beaker/hypervisor/vagrant_workstation.rb
 - lib/beaker/hypervisor/vcloud.rb
@@ -418,6 +426,7 @@ files:
 - lib/beaker/hypervisor/vsphere_helper.rb
 - lib/beaker/junit.xsl
 - lib/beaker/logger.rb
+- lib/beaker/logger_junit.rb
 - lib/beaker/network_manager.rb
 - lib/beaker/options.rb
 - lib/beaker/options/command_line_parser.rb
@@ -468,6 +477,7 @@ files:
 - spec/beaker/hypervisor/solaris_spec.rb
 - spec/beaker/hypervisor/vagrant_fusion_spec.rb
 - spec/beaker/hypervisor/vagrant_libvirt_spec.rb
+- spec/beaker/hypervisor/vagrant_parallels_spec.rb
 - spec/beaker/hypervisor/vagrant_spec.rb
 - spec/beaker/hypervisor/vagrant_virtualbox_spec.rb
 - spec/beaker/hypervisor/vagrant_workstation_spec.rb
@@ -475,7 +485,9 @@ files:
 - spec/beaker/hypervisor/vcloud_spec.rb
 - spec/beaker/hypervisor/vsphere_helper_spec.rb
 - spec/beaker/hypervisor/vsphere_spec.rb
+- spec/beaker/logger_junit_spec.rb
 - spec/beaker/logger_spec.rb
+- spec/beaker/network_manager_spec.rb
 - spec/beaker/options/command_line_parser_spec.rb
 - spec/beaker/options/data/badyaml.cfg
 - spec/beaker/options/data/hosts.cfg