beaker 2.34.0 → 2.35.0

data/lib/beaker/ssh_connection.rb

@@ -162,11 +162,6 @@ module Beaker
                 stderr_callback = stdout_callback
 
       result = Result.new(@hostname, command)
-      # why are we getting to this point on a dry run anyways?
-      # also... the host creates connections through the class method,
-      # which automatically connects, so you can't do a dry run unless you also
-      # can connect to your hosts?
-      return result if options[:dry_run]
 
       @ssh.open_channel do |channel|
         request_terminal_for( channel, command ) if options[:pty]
@@ -267,8 +262,7 @@ module Beaker
       channel.eof!
     end
 
-    def scp_to source, target, options = {}, dry_run = false
-      return if dry_run
+    def scp_to source, target, options = {}
 
       local_opts = options.dup
       if local_opts[:recursive].nil?
@@ -278,10 +272,10 @@ module Beaker
 
       result = Result.new(@hostname, [source, target])
       result.stdout = "\n"
+
       @ssh.scp.upload! source, target, local_opts do |ch, name, sent, total|
         result.stdout << "\tcopying %s: %10d/%d\n" % [name, sent, total]
       end
-
       # Setting these values allows reporting via result.log(test_name)
       result.stdout << "  SCP'ed file #{source} to #{@hostname}:#{target}"
 
@@ -292,8 +286,7 @@ module Beaker
       return result
     end
 
-    def scp_from source, target, options = {}, dry_run = false
-      return if dry_run
+    def scp_from source, target, options = {}
 
       local_opts = options.dup
       if local_opts[:recursive].nil?
@@ -303,10 +296,10 @@ module Beaker
 
       result = Result.new(@hostname, [source, target])
       result.stdout = "\n"
+
       @ssh.scp.download! source, target, local_opts do |ch, name, sent, total|
         result.stdout << "\tcopying %s: %10d/%d\n" % [name, sent, total]
       end
-
       # Setting these values allows reporting via result.log(test_name)
       result.stdout << "  SCP'ed file #{@hostname}:#{source} to #{target}"
 

data/lib/beaker/version.rb

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

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

@@ -805,35 +805,7 @@ describe ClassMixedWithDSLInstallUtils do
 
   describe '#install_puppet_agent_pe_promoted_repo_on' do
 
-    it 'splits the platform string version correctly to get ubuntu puppet-agent packages (format 9999)' do
-      platform = Object.new()
-      allow(platform).to receive(:to_array) { ['ubuntu', '9999', 'x42']}
-      host = basic_hosts.first
-      host['platform'] = platform
-
-      expect(subject).to receive(:fetch_http_file).once.with(/\/puppet-agent\//, "puppet-agent-ubuntu-99.99-x42.tar.gz", /ubuntu/)
-      expect(subject).to receive(:scp_to).once.with(host, /-ubuntu-99.99-x42\./, "/root")
-      expect(subject).to receive(:on).ordered.with(host, /^tar.*-ubuntu-99.99-x42/)
-      expect(subject).to receive(:on).ordered.with(host, /dpkg\ -i\ --force-all/)
-      expect(subject).to receive(:on).ordered.with(host, /apt-get\ update/)
-
-      subject.install_puppet_agent_pe_promoted_repo_on( host, {} )
-    end
-
-    it 'doesn\'t split the platform string version correctly to get ubuntu puppet-agent packages when unnecessary (format 99.99)' do
-      platform = Object.new()
-      allow(platform).to receive(:to_array) { ['ubuntu', '99.99', 'x42']}
-      host = basic_hosts.first
-      host['platform'] = platform
 
-      expect(subject).to receive(:fetch_http_file).once.with(/\/puppet-agent\//, "puppet-agent-ubuntu-99.99-x42.tar.gz", /ubuntu/)
-      expect(subject).to receive(:scp_to).once.with(host, /-ubuntu-99.99-x42\./, "/root")
-      expect(subject).to receive(:on).ordered.with(host, /^tar.*-ubuntu-99.99-x42/)
-      expect(subject).to receive(:on).ordered.with(host, /dpkg\ -i\ --force-all/)
-      expect(subject).to receive(:on).ordered.with(host, /apt-get\ update/)
-
-      subject.install_puppet_agent_pe_promoted_repo_on( host, {} )
-    end
 
   end
 
@@ -1003,12 +975,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :scp_to ).once.with(
         host, /#{release_file}$/, anything )
 
-      noask_text = 'blablabla noask solaris 10 text'
-      allow( host ).to receive( :noask_file_text ).and_return( noask_text )
-      expect( subject ).to receive( :create_remote_file ).with(
-        host, /noask$/, noask_text )
-      expect( subject ).to receive( :on ).with(
-        host, /^gunzip.*#{release_file}.*pkgadd.*noask.*all$/ )
+      expect( host ).to receive( :solaris_install_local_package )
 
       allow( subject ).to receive( :configure_type_defaults_on )
       subject.install_puppet_agent_dev_repo_on( host, opts )
@@ -1098,13 +1065,11 @@ describe ClassMixedWithDSLInstallUtils do
       it 'calls fetch_http_file with no ending slash' do
         test_fetch_http_file_no_ending_slash( 'windows-7-x86_64' )
       end
-
     end
 
     it 'calls fetch_http_file with no ending slash' do
       test_fetch_http_file_no_ending_slash( 'debian-5-x86_64' )
     end
-
   end
 
   describe '#remove_puppet_on' do

data/spec/beaker/host/unix/pkg_spec.rb

@@ -186,6 +186,93 @@ module Beaker
 
     end
 
+    context '#pe_puppet_agent_promoted_package_install' do
+      context 'on solaris platforms' do
+        before :each do
+          allow( subject ).to receive( :fetch_http_file )
+          allow( subject ).to receive( :scp_to )
+          allow( subject ).to receive( :configure_type_defaults_on )
+        end
+
+        context 'version support' do
+          (7..17).each do |version|
+            supported_version = version == 10 || version == 11
+            supported_str = ( supported_version ? '' : 'not ')
+            test_title = "does #{supported_str}support version #{version}"
+
+            it "#{test_title}" do
+              solaris_platform = Beaker::Platform.new("solaris-#{version}-x86_64")
+              @opts = {'platform' => solaris_platform}
+              allow( instance ).to receive( :execute )
+              allow( instance ).to receive( :exec )
+              if supported_version
+                if version == 10
+                  allow( instance ).to receive( :noask_file_text )
+                  allow( instance ).to receive( :create_remote_file )
+                end
+                # only expect diff in the last line: .not_to vs .to raise_error
+                expect{
+                  instance.pe_puppet_agent_promoted_package_install(
+                    'oh_cp_base', 'oh_cp_dl', 'oh_cp_fl', 'dl_fl', {}
+                  )
+                }.not_to raise_error
+              else
+                expect{
+                  instance.pe_puppet_agent_promoted_package_install(
+                    'oh_cp_base', 'oh_cp_dl', 'oh_cp_fl', 'dl_fl', {}
+                  )
+                }.to raise_error(ArgumentError, /^Solaris #{version} is not supported/ )
+              end
+            end
+          end
+
+        end
+
+        context 'on solaris 10' do
+          before :each do
+            solaris_platform = Beaker::Platform.new('solaris-10-x86_64')
+            @opts = {'platform' => solaris_platform}
+          end
+
+          it 'sets a noask file' do
+            allow( instance ).to receive( :execute )
+            allow( instance ).to receive( :exec )
+            expect( instance ).to receive( :noask_file_text )
+            expect( instance ).to receive( :create_remote_file )
+            instance.pe_puppet_agent_promoted_package_install('', '', '', '', {})
+          end
+
+          it 'calls the correct install command' do
+            allow( instance ).to receive( :noask_file_text )
+            allow( instance ).to receive( :create_remote_file )
+            # a number of `execute` calls before the one we're looking for
+            allow( instance ).to receive( :execute )
+            allow( instance ).to receive( :exec )
+            # actual gunzip call to
+            expect( Beaker::Command ).to receive( :new ).with( /^gunzip\ \-c\ / )
+            instance.pe_puppet_agent_promoted_package_install(
+              'oh_cp_base', 'oh_cp_dl', 'oh_cp_fl', 'dl_fl', {}
+            )
+          end
+        end
+
+        context 'on solaris 11' do
+          before :each do
+            solaris_platform = Beaker::Platform.new('solaris-11-x86_64')
+            @opts = {'platform' => solaris_platform}
+          end
+
+          it 'calls the correct install command' do
+            allow( instance ).to receive( :execute )
+            allow( instance ).to receive( :exec )
+            expect( Beaker::Command ).to receive( :new ).with( /^pkg\ install\ \-g / )
+            instance.pe_puppet_agent_promoted_package_install(
+              'oh_cp_base', 'oh_cp_dl', 'oh_cp_fl', 'dl_fl', {}
+            )
+          end
+        end
+      end
+    end
   end
 end
 

data/spec/beaker/host/unix_spec.rb

@@ -179,6 +179,26 @@ module Unix
       end
     end
 
+    describe '#pe_puppet_agent_promoted_package_info' do
+      context 'on ubuntu platforms' do
+        it 'splits the platform string version to get puppet-agent packages (format 9999)' do
+          @platform = 'ubuntu-9999-x42'
+          _, _, download_file = host.pe_puppet_agent_promoted_package_info(
+            'pa_collection'
+          )
+          expect( download_file ).to match( /-ubuntu-99\.99-x42/ )
+        end
+
+        it 'skips splitting the platform string version to get puppet-agent packages when unnecessary (format 99.99)' do
+          @platform = 'ubuntu-88.88-x63'
+          _, _, download_file = host.pe_puppet_agent_promoted_package_info(
+            'pa_collection'
+          )
+          expect( download_file ).to match( /-ubuntu-88\.88-x63/ )
+        end
+      end
+    end
+
     describe '#external_copy_base' do
 
       it 'returns /root in general' do

data/spec/beaker/host_spec.rb

@@ -412,7 +412,7 @@ module Beaker
         @options = { :logger => logger }
         host.instance_variable_set :@connection, conn
         args = [ '/source', 'target', {} ]
-        conn_args = args + [ nil ]
+        conn_args = args
 
         expect( logger ).to receive(:trace)
         expect( conn ).to receive(:scp_to).with( *conn_args ).and_return(Beaker::Result.new(host, 'output!'))
@@ -430,7 +430,7 @@ module Beaker
         @options = { :logger => logger }
         host.instance_variable_set :@connection, conn
         args = [ '/source', 'target', {} ]
-        conn_args = args + [ nil ]
+        conn_args = args
 
         allow( logger ).to receive(:trace)
         expect( conn ).to receive(:scp_to).ordered.with(
@@ -488,7 +488,7 @@ module Beaker
           conn = double(:connection)
           @options = { :logger => logger }
           host.instance_variable_set :@connection, conn
-          args = [ source_path, target_path, {:ignore => [exclude_file]} ]
+          args = [ source_path, target_path, {:ignore => [exclude_file], :dry_run => false} ]
 
           allow( Dir ).to receive( :glob ).and_return( @fileset1 + @fileset2 )
 
@@ -498,12 +498,12 @@ module Beaker
 
           (@fileset1 + @fileset2).each do |file|
             if file !~ /#{exclude_file}/
-              file_args = [ file, File.join(created_target_path, File.dirname(file).gsub(source_path,'')), {:ignore => [exclude_file]} ]
-              conn_args = file_args + [ nil ]
+              file_args = [ file, File.join(created_target_path, File.dirname(file).gsub(source_path,'')), {:ignore => [exclude_file], :dry_run => false} ]
+              conn_args = file_args
               expect( conn ).to receive(:scp_to).with( *conn_args ).and_return(Beaker::Result.new(host, 'output!'))
             else
-              file_args = [ file, File.join(created_target_path, File.dirname(file).gsub(source_path,'')), {:ignore => [exclude_file]} ]
-              conn_args = file_args + [ nil ]
+              file_args = [ file, File.join(created_target_path, File.dirname(file).gsub(source_path,'')), {:ignore => [exclude_file], :dry_run => false} ]
+              conn_args = file_args
               expect( conn ).to_not receive(:scp_to).with( *conn_args )
             end
           end
@@ -553,7 +553,7 @@ module Beaker
           conn = double(:connection)
           @options = { :logger => logger }
           host.instance_variable_set :@connection, conn
-          args = [ 'tmp', 'target', {:ignore => [exclude_file]} ]
+          args = [ 'tmp', 'target', {:ignore => [exclude_file], :dry_run => false} ]
 
           allow( Dir ).to receive( :glob ).and_return( @fileset1 + @fileset2 )
 
@@ -562,19 +562,18 @@ module Beaker
           expect( host ).to receive( :mkdir_p ).with('target/tmp/tests2')
           (@fileset1 + @fileset2).each do |file|
             if file !~ /#{exclude_file}/
-              file_args = [ file, File.join('target', File.dirname(file)), {:ignore => [exclude_file]} ]
-              conn_args = file_args + [ nil ]
+              file_args = [ file, File.join('target', File.dirname(file)), {:ignore => [exclude_file], :dry_run => false} ]
+              conn_args = file_args
               expect( conn ).to receive(:scp_to).with( *conn_args ).and_return(Beaker::Result.new(host, 'output!'))
             else
-              file_args = [ file, File.join('target', File.dirname(file)), {:ignore => [exclude_file]} ]
-              conn_args = file_args + [ nil ]
+              file_args = [ file, File.join('target', File.dirname(file)), {:ignore => [exclude_file], :dry_run => false} ]
+              conn_args = file_args
               expect( conn ).to_not receive(:scp_to).with( *conn_args )
             end
           end
           allow( conn ).to receive(:ip).and_return(host['ip'])
           allow( conn ).to receive(:vmhostname).and_return(host['vmhostname'])
           allow( conn ).to receive(:hostname).and_return(host.name)
-
           host.do_scp_to *args
         end
 
@@ -584,7 +583,7 @@ module Beaker
           conn = double(:connection)
           @options = { :logger => logger }
           host.instance_variable_set :@connection, conn
-          args = [ 'tmp', 'target', {:ignore => [exclude_file]} ]
+          args = [ 'tmp', 'target', {:ignore => [exclude_file], :dry_run => false} ]
 
           allow( Dir ).to receive( :glob ).and_return( @fileset1 + @fileset2 )
 
@@ -592,13 +591,13 @@ module Beaker
           expect( host ).to_not receive( :mkdir_p ).with('target/tmp/tests')
           expect( host ).to receive( :mkdir_p ).with('target/tmp/tests2')
           (@fileset1).each do |file|
-            file_args = [ file, File.join('target', File.dirname(file)), {:ignore => [exclude_file]} ]
-            conn_args = file_args + [ nil ]
+            file_args = [ file, File.join('target', File.dirname(file)), {:ignore => [exclude_file], :dry_run => false} ]
+            conn_args = file_args
             expect( conn ).to_not receive(:scp_to).with( *conn_args )
           end
           (@fileset2).each do |file|
-            file_args = [ file, File.join('target', File.dirname(file)), {:ignore => [exclude_file]} ]
-            conn_args = file_args + [ nil ]
+            file_args = [ file, File.join('target', File.dirname(file)), {:ignore => [exclude_file], :dry_run => false} ]
+            conn_args = file_args
             expect( conn ).to receive(:scp_to).with( *conn_args ).and_return(Beaker::Result.new(host, 'output!'))
           end
 
@@ -617,7 +616,7 @@ module Beaker
         @options = { :logger => logger }
         host.instance_variable_set :@connection, conn
         args = [ 'source', 'target', {} ]
-        conn_args = args + [ nil ]
+        conn_args = args
 
         expect( logger ).to receive(:debug)
         expect( conn ).to receive(:scp_from).with( *conn_args ).and_return(Beaker::Result.new(host, 'output!'))

data/spec/beaker/hypervisor/docker_spec.rb

@@ -220,6 +220,14 @@ module Beaker
               'container_path' => '/different_mount',
               'opts' => 'rw',
             },
+            'mount4' => {
+              'host_path' => './',
+              'container_path' => '/relative_mount',
+            },
+            'mount5' => {
+              'host_path' => 'local_folder',
+              'container_path' => '/another_relative_mount',
+            }
           }
 
           expect( ::Docker::Container ).to receive(:create).with({
@@ -230,6 +238,8 @@ module Beaker
                 '/source_folder:/mount_point',
                 '/another_folder:/another_mount:ro',
                 '/different_folder:/different_mount:rw',
+                "#{File.expand_path('./')}:/relative_mount",
+                "#{File.expand_path('local_folder')}:/another_relative_mount",
               ]
             }
           })

data/spec/beaker/hypervisor/hypervisor_spec.rb

@@ -73,6 +73,25 @@ module Beaker
       let( :hosts ) { make_hosts( { :platform => 'el-5' } ) }
       let( :hypervisor ) { Beaker::Hypervisor.new( hosts, options ) }
 
+      context 'if :timesync option set true on host' do
+        it 'does call timesync for host' do
+          hosts[0][:timesync] = true
+          allow( hypervisor ).to receive( :set_env )
+          expect( hypervisor ).to receive( :timesync ).once
+          hypervisor.configure
+        end
+      end
+
+      context 'if :timesync option set true but false on host' do
+        it 'does not call timesync for host' do
+          options[:timesync] = true
+          hosts[0][:timesync] = false
+          allow( hypervisor ).to receive( :set_env )
+          expect( hypervisor ).to_not receive( :timesync )
+          hypervisor.configure
+        end
+      end
+
       context "if :disable_iptables option set false" do
         it "does not call disable_iptables" do
           options[:disable_iptables] = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.34.0
+  version: 2.35.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec