beaker 2.1.0 → 2.2.0

data/spec/beaker/dsl/install_utils_spec.rb

@@ -812,6 +812,86 @@ describe ClassMixedWithDSLInstallUtils do
 
   end
 
+  describe '#install_puppetagent_dev_repo' do
+
+    it 'raises an exception when host platform is unsupported' do
+      platform = Object.new()
+      allow(platform).to receive(:to_array) { ['ptan', '5', 'x4']}
+      host = basic_hosts.first
+      host['platform'] = platform
+      opts = { :version => '0.1.0' }
+      allow( subject ).to receive( :options ).and_return( {} )
+
+      expect{
+        subject.install_puppetagent_dev_repo( host, opts )
+      }.to raise_error(RuntimeError, /No repository installation step for/)
+    end
+
+    it 'runs the correct install for el-based platforms' do
+      platform = Object.new()
+      allow(platform).to receive(:to_array) { ['el', '5', 'x4']}
+      host = basic_hosts.first
+      host['platform'] = platform
+      opts = { :version => '0.1.0' }
+      allow( subject ).to receive( :options ).and_return( {} )
+
+      expect(subject).to receive(:fetch_http_file).once.with(/\/el\//, /-agent-/, /el/)
+      expect(subject).to receive(:scp_to).once.with(host, /-agent-/, "/root")
+      expect(subject).to receive(:on).once.with(host, /rpm\ -ivh/)
+
+      subject.install_puppetagent_dev_repo( host, opts )
+    end
+
+    it 'runs the correct install for debian-based platforms' do
+      platform = Object.new()
+      allow(platform).to receive(:to_array) { ['debian', '5', 'x4']}
+      host = basic_hosts.first
+      host['platform'] = platform
+      opts = { :version => '0.1.0' }
+      allow( subject ).to receive( :options ).and_return( {} )
+
+      expect(subject).to receive(:fetch_http_file).once.with(/\/deb\//, /-agent_/, /deb/)
+      expect(subject).to receive(:scp_to).once.with(host, /-agent_/, "/root")
+      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_puppetagent_dev_repo( host, opts )
+    end
+
+    it 'allows you to override the local copy directory' do
+      platform = Object.new()
+      allow(platform).to receive(:to_array) { ['debian', '5', 'x4']}
+      host = basic_hosts.first
+      host['platform'] = platform
+      opts = { :version => '0.1.0', :copy_base_local => 'face' }
+      allow( subject ).to receive( :options ).and_return( {} )
+
+      expect(subject).to receive(:fetch_http_file).once.with(/\/deb\//, /-agent_/, /face/)
+      expect(subject).to receive(:scp_to).once.with(host, /face/, "/root")
+      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_puppetagent_dev_repo( host, opts )
+    end
+
+    it 'allows you to override the external copy directory' do
+      platform = Object.new()
+      allow(platform).to receive(:to_array) { ['debian', '5', 'x4']}
+      host = basic_hosts.first
+      host['platform'] = platform
+      opts = { :version => '0.1.0', :copy_dir_external => 'muppetsB' }
+      allow( subject ).to receive( :options ).and_return( {} )
+
+      expect(subject).to receive(:fetch_http_file).once.with(/\/deb\//, /-agent_/, /deb/)
+      expect(subject).to receive(:scp_to).once.with(host, /-agent_/, /muppetsB/)
+      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_puppetagent_dev_repo( host, opts )
+    end
+
+  end
+
   describe '#install_dev_puppet_module_on' do
     context 'having set allow( a ).to receive forge' do
       it 'stubs the forge on the host' do

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -292,21 +292,10 @@ describe Beaker do
   context "sync_root_keys" do
     subject { dummy_class.new }
 
-    it "can sync keys on a solaris host" do
+    it "can sync keys on a solaris/eos host" do
       @platform = 'solaris'
 
-      expect( Beaker::Command ).to receive( :new ).with( sync_cmd % "| bash" ).exactly( 3 ).times
-
-      subject.sync_root_keys( hosts, options )
-
-    end
-
-    it "can sync keys on an eos host" do
-      @platform = 'eos'
-
-      expect( Beaker::Command ).to receive( :new ).with( sync_cmd % "> manage_root_authorized_keys" ).exactly( 3 ).times
-      expect( Beaker::Command ).to receive( :new ).with( "sed -i 's|mv -f $SSH_HOME/authorized_keys.tmp $SSH_HOME/authorized_keys|cp -f $SSH_HOME/authorized_keys.tmp $SSH_HOME/authorized_keys|' manage_root_authorized_keys" ).exactly( 3 ).times
-      expect( Beaker::Command ).to receive( :new ).with( "bash manage_root_authorized_keys" ).exactly( 3 ).times
+      expect( Beaker::Command ).to receive( :new ).with( sync_cmd % "bash" ).exactly( 3 ).times
 
       subject.sync_root_keys( hosts, options )
 
@@ -314,7 +303,7 @@ describe Beaker do
 
     it "can sync keys on a non-solaris host" do
 
-      expect( Beaker::Command ).to receive( :new ).with( sync_cmd % "| env PATH=/usr/gnu/bin:$PATH bash" ).exactly( 3 ).times
+      expect( Beaker::Command ).to receive( :new ).with( sync_cmd % "env PATH=/usr/gnu/bin:$PATH bash" ).exactly( 3 ).times
 
       subject.sync_root_keys( hosts, options )
 
@@ -449,7 +438,7 @@ describe Beaker do
 
     it "can set the environment on a windows host" do
       commands = [
-        "echo 'PermitUserEnvironment yes\n' >> /etc/sshd_config",
+        "echo '\nPermitUserEnvironment yes' >> /etc/sshd_config",
         "cygrunsrv -E sshd",
         "cygrunsrv -S sshd"
       ]
@@ -458,7 +447,7 @@ describe Beaker do
 
     it "can set the environment on an OS X host" do
       commands = [
-        "echo 'PermitUserEnvironment yes\n' >> /etc/sshd_config",
+        "echo '\nPermitUserEnvironment yes' >> /etc/sshd_config",
         "launchctl unload /System/Library/LaunchDaemons/ssh.plist",
         "launchctl load /System/Library/LaunchDaemons/ssh.plist"
       ]
@@ -467,7 +456,7 @@ describe Beaker do
 
     it "can set the environment on an ssh-based linux host" do
       commands = [
-        "echo 'PermitUserEnvironment yes\n' >> /etc/ssh/sshd_config",
+        "echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config",
         "service ssh restart"
       ]
       set_env_helper('ubuntu', commands)
@@ -475,15 +464,15 @@ describe Beaker do
 
     it "can set the environment on an sshd-based linux host" do
       commands = [
-          "echo 'PermitUserEnvironment yes\n' >> /etc/ssh/sshd_config",
-          "service sshd restart"
+          "echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config",
+          "/sbin/service sshd restart"
       ]
       set_env_helper('eos', commands)
     end
 
     it "can set the environment on an sles host" do
       commands = [
-        "echo 'PermitUserEnvironment yes\n' >> /etc/ssh/sshd_config",
+        "echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config",
         "rcsshd restart"
       ]
       set_env_helper('sles', commands)
@@ -491,7 +480,7 @@ describe Beaker do
 
     it "can set the environment on a solaris host" do
       commands = [
-        "echo 'PermitUserEnvironment yes\n' >> /etc/ssh/sshd_config",
+        "echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config",
         "svcadm restart svc:/network/ssh:default"
       ]
       set_env_helper('solaris', commands)
@@ -499,7 +488,7 @@ describe Beaker do
 
     it "can set the environment on an aix host" do
       commands = [
-        "echo 'PermitUserEnvironment yes\n' >> /etc/ssh/sshd_config",
+        "echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config",
         "stopsrc -g ssh",
         "startsrc -g ssh"
       ]
@@ -520,6 +509,9 @@ describe Beaker do
       host_specific_commands_array.each do |command|
         expect( Beaker::Command ).to receive( :new ).with( command ).once
       end
+
+      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( host ).to receive( :add_env_var ).with( 'RUBYLIB', '$RUBYLIB' ).once
       expect( host ).to receive( :add_env_var ).with( 'PATH', '$PATH' ).once
@@ -527,7 +519,7 @@ describe Beaker do
         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 + 1 ).times
+      expect( host ).to receive( :exec ).exactly( host_specific_commands_array.length + 3 ).times
 
       subject.set_env(host, options.merge( opts ))
     end

data/spec/beaker/host_spec.rb

@@ -233,10 +233,22 @@ module Beaker
         host.instance_variable_set :@connection, conn
       end
 
-      it 'takes a command object and a hash of options'
-      it "acts on the host's logger and connection object"
-      it 'receives a result object from the connection#execute'
-      it "returns the result object"
+      it 'takes a command object and a hash of options' do
+        result.exit_code = 0
+        expect{ host.exec(command, {}) }.to_not raise_error
+      end
+
+      it 'acts on the host\'s logger and connection object' do
+        result.exit_code = 0
+        expect( host.instance_variable_get(:@logger) ).to receive(:debug).at_least(1).times
+        expect( host.instance_variable_get(:@connection) ).to receive(:execute).once
+        host.exec(command)
+      end
+
+      it 'returns the result object' do
+        result.exit_code = 0
+        expect( host.exec(command) ).to be === result
+      end
 
       it 'logs the amount of time spent executing the command' do
         result.exit_code = 0
@@ -372,11 +384,11 @@ module Beaker
 
           (@fileset1 + @fileset2).each do |file|
             if file !~ /#{exclude_file}/
-              file_args = [ file, File.join(target_path, file.gsub(source_path,'')), {:ignore => [exclude_file]} ]
+              file_args = [ file, File.join(target_path, File.dirname(file).gsub(source_path,'')), {:ignore => [exclude_file]} ]
               conn_args = file_args + [ nil ]
               expect( conn ).to receive(:scp_to).with( *conn_args ).and_return(Beaker::Result.new(host, 'output!'))
             else
-              file_args = [ file, File.join(target_path, file.gsub(source_path,'')), {:ignore => [exclude_file]} ]
+              file_args = [ file, File.join(target_path, File.dirname(file).gsub(source_path,'')), {:ignore => [exclude_file]} ]
               conn_args = file_args + [ nil ]
               expect( conn ).to_not receive(:scp_to).with( *conn_args )
             end
@@ -433,9 +445,13 @@ 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), {:ignore => [exclude_file]} ]
+              file_args = [ file, File.join('target', File.dirname(file)), {:ignore => [exclude_file]} ]
               conn_args = file_args + [ nil ]
               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 ]
+              expect( conn ).to_not receive(:scp_to).with( *conn_args )
             end
           end
 
@@ -453,9 +469,15 @@ module Beaker
           allow( Dir ).to receive( :glob ).and_return( @fileset1 + @fileset2 )
 
           expect( logger ).to receive(:trace)
+          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 ]
+            expect( conn ).to_not receive(:scp_to).with( *conn_args )
+          end
           (@fileset2).each do |file|
-            file_args = [ file, File.join('target', file), {:ignore => [exclude_file]} ]
+            file_args = [ file, File.join('target', File.dirname(file)), {:ignore => [exclude_file]} ]
             conn_args = file_args + [ nil ]
             expect( conn ).to receive(:scp_to).with( *conn_args ).and_return(Beaker::Result.new(host, 'output!'))
           end

data/spec/beaker/hypervisor/docker_spec.rb

@@ -22,6 +22,11 @@ module Beaker
       logger
     end
 
+    let(:options) {{
+      :logger => logger,
+      :forward_ssh_agent => true,
+    }}
+
     let(:image) do
       image = double('Docker::Image')
       allow( image ).to receive(:id)
@@ -52,7 +57,7 @@ module Beaker
       container
     end
 
-    let (:docker) { ::Beaker::Docker.new( hosts, { :logger => logger }) }
+    let (:docker) { ::Beaker::Docker.new( hosts, options ) }
     let(:docker_options) { nil }
 
     before :each do
@@ -165,6 +170,18 @@ module Beaker
           expect( hosts[0]['ip'] ).to be === '192.0.2.2'
           expect( hosts[0]['port'] ).to be === 8022
         end
+
+        it 'should have ssh agent forwarding enabled' do
+          ENV['DOCKER_HOST'] = nil
+          docker.provision
+
+          expect( hosts[0]['ip'] ).to be === '127.0.1.1'
+          expect( hosts[0]['port'] ).to be === 8022
+          expect( hosts[0]['ssh'][:password] ).to be ===  'root'
+          expect( hosts[0]['ssh'][:port] ).to be ===  8022
+          expect( hosts[0]['ssh'][:forward_agent] ).to be === true
+        end
+
       end
 
       it 'should record the image and container for later' do

data/spec/beaker/hypervisor/hypervisor_spec.rb

@@ -89,6 +89,30 @@ module Beaker
         end
       end
 
+      context 'if :configure option set false' do
+        it 'does not make any configure calls' do
+          options[:configure]         = false
+          options[:timesync]          = true
+          options[:root_keys]         = true
+          options[:add_el_extras]     = true
+          options[:disable_iptables]  = true
+          expect( hypervisor ).to_not receive( :timesync )
+          expect( hypervisor ).to_not receive( :sync_root_keys )
+          expect( hypervisor ).to_not receive( :add_el_extras )
+          expect( hypervisor ).to_not receive( :disable_iptables )
+          expect( hypervisor ).to_not receive( :set_env )
+          hypervisor.configure
+        end
+      end
+
+      context 'if :configure option set true' do
+        it 'does call set_env' do
+          options[:configure] = true
+          expect( hypervisor ).to receive( :set_env ).once
+          hypervisor.configure
+        end
+      end
+
     end
 
   end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -2,7 +2,15 @@ require 'spec_helper'
 
 module Beaker
   describe Vagrant do
-    let( :options ) { make_opts.merge({ 'logger' => double().as_null_object, :hosts_file => 'sample.cfg' }) }
+
+    let( :options ) {
+      make_opts.merge({
+        'logger' => double().as_null_object,
+        :hosts_file => 'sample.cfg',
+        :forward_ssh_agent => true,
+      })
+    }
+
     let( :vagrant ) { Beaker::Vagrant.new( @hosts, options ) }
 
     before :each do
@@ -31,8 +39,7 @@ Vagrant.configure("2") do |c|
     v.vm.box = 'vm1_of_my_box'
     v.vm.box_url = 'http://address.for.my.box.vm1'
     v.vm.box_check_update = 'true'
-    v.vm.base_mac = '0123456789'
-    v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0"
+    v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0", :mac => "0123456789"
     v.vm.provider :virtualbox do |vb|
       vb.customize ['modifyvm', :id, '--memory', '1024']
     end
@@ -42,8 +49,7 @@ Vagrant.configure("2") do |c|
     v.vm.box = 'vm2_of_my_box'
     v.vm.box_url = 'http://address.for.my.box.vm2'
     v.vm.box_check_update = 'true'
-    v.vm.base_mac = '0123456789'
-    v.vm.network :private_network, ip: "ip.address.for.vm2", :netmask => "255.255.0.0"
+    v.vm.network :private_network, ip: "ip.address.for.vm2", :netmask => "255.255.0.0", :mac => "0123456789"
     v.vm.provider :virtualbox do |vb|
       vb.customize ['modifyvm', :id, '--memory', '1024']
     end
@@ -53,8 +59,7 @@ Vagrant.configure("2") do |c|
     v.vm.box = 'vm3_of_my_box'
     v.vm.box_url = 'http://address.for.my.box.vm3'
     v.vm.box_check_update = 'true'
-    v.vm.base_mac = '0123456789'
-    v.vm.network :private_network, ip: "ip.address.for.vm3", :netmask => "255.255.0.0"
+    v.vm.network :private_network, ip: "ip.address.for.vm3", :netmask => "255.255.0.0", :mac => "0123456789"
     v.vm.provider :virtualbox do |vb|
       vb.customize ['modifyvm', :id, '--memory', '1024']
     end
@@ -63,6 +68,17 @@ end
 EOF
     end
 
+    it "can make a Vagrantfile with ssh agent forwarding enabled" do
+      path = vagrant.instance_variable_get( :@vagrant_path )
+      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
+
+      hosts = make_hosts({},1)
+      vagrant.make_vfile( hosts, options )
+
+      vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
+      expect( vagrantfile ).to match(/(ssh.forward_agent = true)/)
+    end
+
     it "generates a valid windows config" do
       path = vagrant.instance_variable_get( :@vagrant_path )
       allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )

data/spec/beaker/hypervisor/vsphere_spec.rb

@@ -44,6 +44,20 @@ module Beaker
 
       end
 
+      it 'provisions hosts if no snapshot is provided' do
+        MockVsphereHelper.powerOff
+        hosts = make_hosts()
+        hosts[0]["snapshot"] = nil
+        vsphere = Beaker::Vsphere.new( hosts, make_opts )
+
+        vsphere.provision
+
+        hosts.each do |host|
+          expect( MockVsphereHelper.find_vm( host.name ).powerState ) == "poweredOn"
+        end
+
+      end
+
     end
 
     describe "#cleanup" do

data/spec/beaker/options/command_line_parser_spec.rb

@@ -9,6 +9,8 @@ module Beaker
       let(:full_opts) {["--hosts", "host.cfg", "--options", "opts_file", "--type", "pe", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "always", "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath", "-m", "module", "-q", "--dry-run", "--no-ntp", "--repo-proxy", "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast", "--no-color", "--version", "--log-level", "info", "--package-proxy", "http://192.168.100.1:3128", "--collect-perf-data", "--parse-only", "--validate", "--timeout", "40"]}
       let(:validate_true)  {["--validate"]}
       let(:validate_false) {["--no-validate"]}
+      let(:configure_true)  {['--configure']}
+      let(:configure_false) {['--no-configure']}
 
 
       it "can correctly read command line input" do
@@ -24,6 +26,11 @@ module Beaker
         expect(parser.parse(validate_false)).to be === {:validate=>false}
       end
 
+      it 'supports both configure options' do
+        expect(parser.parse(configure_true)).to be === {:configure=>true}
+        expect(parser.parse(configure_false)).to be === {:configure=>false}
+      end
+
       it "can produce a usage description" do
         expect{parser.usage}.to_not raise_error 
       end