beaker 2.5.1 → 2.6.0

data/lib/beaker/version.rb

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

data/spec/beaker/dsl/helpers_spec.rb

@@ -1393,4 +1393,20 @@ describe ClassMixedWithDSLHelpers do
 
   end
 
+  describe '#hiera_datadir' do
+    it 'returns the codedir based hieradatadir for AIO' do
+      host = hosts[0]
+      host['type'] = :aio
+      correct_answer = File.join(host.puppet['codedir'], 'hieradata')
+      expect( subject.hiera_datadir(host) ).to be === correct_answer
+    end
+
+    it 'returns the hieradata host value for anything not AIO (backwards compatible)' do
+      host_hieradatadir_value = '/home/fishing/man/pants'
+      host = hosts[0]
+      host[:hieradatadir] = host_hieradatadir_value
+      expect( subject.hiera_datadir(host) ).to be === host_hieradatadir_value
+    end
+  end
+
 end

data/spec/beaker/dsl/install_utils_spec.rb

@@ -588,7 +588,7 @@ describe ClassMixedWithDSLInstallUtils do
       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\" > /etc/puppet/puppet.conf")
+        expect(subject).to receive(:on).with(host, "echo \"[main]\nserver=testbox.test.local\n\n\" > #{host.puppet['config']}")
         subject.configure_puppet_on(host, config)
       end
     end
@@ -599,7 +599,7 @@ describe ClassMixedWithDSLInstallUtils 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 '`cygpath -smF 35`/PuppetLabs/puppet/etc\\puppet.conf' -value $text"])
+          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
         subject.configure_puppet_on(host, config)
       end
@@ -619,7 +619,7 @@ describe ClassMixedWithDSLInstallUtils do
       let(: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(hosts[0], "echo \"[main]\nserver=testbox.test.local\n\n\" > /etc/puppet/puppet.conf")
+        expect(subject).to receive(:on).with(hosts[0], "echo \"[main]\nserver=testbox.test.local\n\n\" > #{hosts[0].puppet['config']}")
         subject.configure_puppet(config)
       end
     end
@@ -629,7 +629,7 @@ describe ClassMixedWithDSLInstallUtils 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 '`cygpath -smF 35`/PuppetLabs/puppet/etc\\puppet.conf' -value $text"])
+          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
         subject.configure_puppet(config)
       end
@@ -1122,7 +1122,7 @@ describe ClassMixedWithDSLInstallUtils do
         result = double
         stdout = target.split('/')[0..-2].join('/') + "\n"
         allow( result ).to receive(:stdout).and_return( stdout )
-        allow( host ).to receive(:exec).with( any_args ).and_return( result )
+        expect( subject ).to receive(:on).with(host, "echo #{File.dirname(target)}" ).and_return(result )
         allow( Dir ).to receive(:getpwd).and_return(source)
 
         allow( subject ).to receive(:parse_for_moduleroot).and_return(source)
@@ -1135,7 +1135,8 @@ describe ClassMixedWithDSLInstallUtils do
         allow( File ).to receive(:exists?).with(any_args()).and_return(false)
         allow( File ).to receive(:directory?).with(any_args()).and_return(false)
 
-        expect( subject ).to receive(:scp_to).with(host,source, target, {:ignore => ignore_list})
+        expect( subject ).to receive(:scp_to).with(host,source, File.dirname(target), {:ignore => ignore_list})
+        expect( subject ).to receive(:on).with(host, "mv #{File.join(File.dirname(target), File.basename(source))} #{target}")
         if opts.nil?
           subject.copy_module_to(host)
         else

data/spec/beaker/host_spec.rb

@@ -66,7 +66,7 @@ module Beaker
 
       it 'sets the paths correctly for an AIO host' do
         options['type'] = 'aio'
-        expect(host['puppetvardir']).to be === Unix::Host::aio_defaults[:puppetvardir]
+        expect(host['puppetvardir']).to be_nil
       end
     end
 
@@ -186,7 +186,7 @@ module Beaker
       it "does nothing if the key/value pair already exists" do
         result = Beaker::Result.new(host, '')
         result.exit_code = 0
-        expect( Beaker::Command ).to receive(:new).with("grep -e KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
+        expect( Beaker::Command ).to receive(:new).with("grep KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
         expect( host ).to receive(:exec).once.and_return(result)
 
         host.add_env_var('key', '/my/first/value')
@@ -195,7 +195,7 @@ module Beaker
       it "adds new line to environment file if no env var of that name already exists" do
         result = Beaker::Result.new(host, '')
         result.exit_code = 1
-        expect( Beaker::Command ).to receive(:new).with("grep -e KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
+        expect( Beaker::Command ).to receive(:new).with("grep KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
         expect( host ).to receive(:exec).and_return(result)
         expect( Beaker::Command ).to receive(:new).with(/grep KEY ~\/\.ssh\/environment/)
         expect( host ).to receive(:exec).and_return(result)
@@ -206,7 +206,7 @@ module Beaker
       it "updates existing line in environment file when adding additional value to existing variable" do
         result = Beaker::Result.new(host, '')
         result.exit_code = 1
-        expect( Beaker::Command ).to receive(:new).with("grep -e KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
+        expect( Beaker::Command ).to receive(:new).with("grep KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
         expect( host ).to receive(:exec).and_return(result)
         result = Beaker::Result.new(host, '')
         result.exit_code = 0
@@ -221,7 +221,8 @@ module Beaker
     describe "#delete_env_var" do
       it "deletes env var" do
         expect( Beaker::SedCommand ).to receive(:new).with('unix', '/KEY=\\/my\\/first\\/value$/d', '~/.ssh/environment')
-        expect( Beaker::SedCommand ).to receive(:new).with('unix', 's/KEY=\\(.*[:;]*\\)\\/my\\/first\\/value[:;]*/KEY=\\1/', '~/.ssh/environment')
+        expect( Beaker::SedCommand ).to receive(:new).with("unix", "s/KEY=\\(.*\\)[;:]\\/my\\/first\\/value/KEY=\\1/", "~/.ssh/environment")
+        expect( Beaker::SedCommand ).to receive(:new).with("unix", "s/KEY=\\/my\\/first\\/value[;:]/KEY=/", "~/.ssh/environment")
         host.delete_env_var('key', '/my/first/value')
       end
 
@@ -355,7 +356,7 @@ module Beaker
         allow( result ).to receive( :exit_code ).and_return( 0 )
         allow( host ).to receive( :exec ).and_return( result )
 
-        expect( Beaker::Command ).to receive(:new).with("if not exist test\\test\\test (md )")
+        expect( Beaker::Command ).to receive(:new).with("if not exist test\\test\\test (md test\\test\\test)")
         expect( host.mkdir_p('test/test/test') ).to be == true
 
       end
@@ -372,7 +373,7 @@ module Beaker
         conn = double(:connection)
         @options = { :logger => logger }
         host.instance_variable_set :@connection, conn
-        args = [ 'source', 'target', {} ]
+        args = [ '/source', 'target', {} ]
         conn_args = args + [ nil ]
 
         expect( logger ).to receive(:trace)
@@ -419,6 +420,7 @@ module Beaker
           host.do_scp_to *args
         end
         it 'can take an ignore list that excludes a single file and scp the rest' do
+          created_target_path = File.join(target_path, File.basename(source_path))
           exclude_file = '07_InstallCACerts.rb'
           logger = host[:logger]
           conn = double(:connection)
@@ -429,16 +431,16 @@ module Beaker
           allow( Dir ).to receive( :glob ).and_return( @fileset1 + @fileset2 )
 
           expect( logger ).to receive(:trace)
-          expect( host ).to receive( :mkdir_p ).with("#{target_path}/tests")
-          expect( host ).to receive( :mkdir_p ).with("#{target_path}/tests2")
+          expect( host ).to receive( :mkdir_p ).with("#{created_target_path}/tests")
+          expect( host ).to receive( :mkdir_p ).with("#{created_target_path}/tests2")
 
           (@fileset1 + @fileset2).each do |file|
             if file !~ /#{exclude_file}/
-              file_args = [ file, File.join(target_path, File.dirname(file).gsub(source_path,'')), {:ignore => [exclude_file]} ]
+              file_args = [ file, File.join(created_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.dirname(file).gsub(source_path,'')), {:ignore => [exclude_file]} ]
+              file_args = [ file, File.join(created_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

data/spec/beaker/hypervisor/hypervisor_spec.rb

@@ -33,10 +33,10 @@ module Beaker
       expect( hypervisor.create( 'fusion', [], make_opts() ) ).to be === fusion
     end
 
-    it "creates a vcloudpooled hypervisor for vcloud hosts that are pooled" do
+    it "creates a vmpooler hypervisor for hosts that are pooled" do
       vcloud = double( 'vcloud' )
       allow( vcloud ).to receive( :provision ).and_return( true )
-      expect( VcloudPooled ).to receive( :new ).once.and_return( vcloud )
+      expect( Vmpooler ).to receive( :new ).once.and_return( vcloud )
       expect( hypervisor.create( 'vcloud', [], make_opts().merge( { 'pooling_api' => true } ) ) ).to be === vcloud
     end
 

data/spec/beaker/hypervisor/{vcloud_pooled_spec.rb → vmpooler_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Beaker
-  describe VcloudPooled do
+  describe Vmpooler do
 
     before :each do
       vms = make_hosts()
@@ -18,25 +18,25 @@ module Beaker
     describe '#get_template_url' do
 
       it 'works returns the valid url when passed valid pooling_api and template name' do
-        vcloud = Beaker::VcloudPooled.new( make_hosts, make_opts )
-        uri = vcloud.get_template_url("http://pooling.com", "template")
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        uri = vmpooler.get_template_url("http://pooling.com", "template")
         expect( uri ).to be === "http://pooling.com/vm/template"
       end
       
       it 'adds a missing scheme to a given URL' do
-        vcloud = Beaker::VcloudPooled.new( make_hosts, make_opts )
-        uri = vcloud.get_template_url("pooling.com", "template")
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        uri = vmpooler.get_template_url("pooling.com", "template")
         expect( URI.parse(uri).scheme ).to_not be === nil
       end
 
       it 'raises an error on an invalid pooling api url' do
-        vcloud = Beaker::VcloudPooled.new( make_hosts, make_opts )
-        expect{ vcloud.get_template_url("pooling###   ", "template")}.to raise_error ArgumentError
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        expect{ vmpooler.get_template_url("pooling###   ", "template")}.to raise_error ArgumentError
       end
 
       it 'raises an error on an invalide template name' do
-        vcloud = Beaker::VcloudPooled.new( make_hosts, make_opts )
-        expect{ vcloud.get_template_url("pooling.com", "t!e&m*p(l\\a/t e")}.to raise_error ArgumentError
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        expect{ vmpooler.get_template_url("pooling.com", "t!e&m*p(l\\a/t e")}.to raise_error ArgumentError
       end
       
     end
@@ -45,12 +45,12 @@ module Beaker
 
       it 'provisions hosts from the pool' do 
 
-        vcloud = Beaker::VcloudPooled.new( make_hosts, make_opts )
-        allow( vcloud ).to receive( :require ).and_return( true )
-        allow( vcloud ).to receive( :sleep ).and_return( true )
-        vcloud.provision
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        allow( vmpooler ).to receive( :require ).and_return( true )
+        allow( vmpooler ).to receive( :sleep ).and_return( true )
+        vmpooler.provision
 
-        hosts = vcloud.instance_variable_get( :@hosts )
+        hosts = vmpooler.instance_variable_get( :@hosts )
         hosts.each do | host |
           expect( host['vmhostname'] ).to be === 'pool'
         end
@@ -64,13 +64,13 @@ module Beaker
       it "cleans up hosts in the pool" do
         MockVsphereHelper.powerOn
 
-        vcloud = Beaker::VcloudPooled.new( make_hosts, make_opts )
-        allow( vcloud ).to receive( :require ).and_return( true )
-        allow( vcloud ).to receive( :sleep ).and_return( true )
-        vcloud.provision
-        vcloud.cleanup
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        allow( vmpooler ).to receive( :require ).and_return( true )
+        allow( vmpooler ).to receive( :sleep ).and_return( true )
+        vmpooler.provision
+        vmpooler.cleanup
 
-        hosts = vcloud.instance_variable_get( :@hosts )
+        hosts = vmpooler.instance_variable_get( :@hosts )
         hosts.each do | host |
           name = host.name
           vm = MockVsphereHelper.find_vm( name )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -365,6 +365,35 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- acceptance/fixtures/README.md
+- acceptance/fixtures/module/Gemfile
+- acceptance/fixtures/module/README.md
+- acceptance/fixtures/module/Rakefile
+- acceptance/fixtures/module/lib/empty.txt
+- acceptance/fixtures/module/manifests/init.pp
+- acceptance/fixtures/module/metadata.json
+- acceptance/fixtures/module/spec/acceptance/demo_spec.rb
+- acceptance/fixtures/module/spec/acceptance/nodesets/centos-59-x64.yml
+- acceptance/fixtures/module/spec/acceptance/nodesets/centos-64-x64-pe.yml
+- acceptance/fixtures/module/spec/acceptance/nodesets/centos-64-x64.yml
+- acceptance/fixtures/module/spec/acceptance/nodesets/centos-65-x64.yml
+- acceptance/fixtures/module/spec/acceptance/nodesets/default.yml
+- acceptance/fixtures/module/spec/acceptance/nodesets/fedora-18-x64.yml
+- acceptance/fixtures/module/spec/acceptance/nodesets/internal-vpool.yml
+- acceptance/fixtures/module/spec/acceptance/nodesets/sles-11-x64.yml
+- acceptance/fixtures/module/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+- acceptance/fixtures/module/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+- acceptance/fixtures/module/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+- acceptance/fixtures/module/spec/acceptance/nodesets/ubuntu-server-14042-x64.yml
+- acceptance/fixtures/module/spec/classes/init_spec.rb
+- acceptance/fixtures/module/spec/spec_helper.rb
+- acceptance/fixtures/module/spec/spec_helper_acceptance.rb
+- acceptance/fixtures/module/tests/init.pp
+- acceptance/fixtures/module/vendor/bundle/ruby/gems.txt
+- acceptance/pre_suite/README.md
+- acceptance/tests/base/README.md
+- acceptance/tests/base/host.rb
+- acceptance/tests/puppet/README.md
 - beaker.gemspec
 - bin/beaker
 - ext/completion/beaker-completion.bash
@@ -435,7 +464,7 @@ files:
 - lib/beaker/hypervisor/vagrant_virtualbox.rb
 - lib/beaker/hypervisor/vagrant_workstation.rb
 - lib/beaker/hypervisor/vcloud.rb
-- lib/beaker/hypervisor/vcloud_pooled.rb
+- lib/beaker/hypervisor/vmpooler.rb
 - lib/beaker/hypervisor/vsphere.rb
 - lib/beaker/hypervisor/vsphere_helper.rb
 - lib/beaker/junit.xsl
@@ -495,8 +524,8 @@ files:
 - spec/beaker/hypervisor/vagrant_spec.rb
 - spec/beaker/hypervisor/vagrant_virtualbox_spec.rb
 - spec/beaker/hypervisor/vagrant_workstation_spec.rb
-- spec/beaker/hypervisor/vcloud_pooled_spec.rb
 - spec/beaker/hypervisor/vcloud_spec.rb
+- spec/beaker/hypervisor/vmpooler_spec.rb
 - spec/beaker/hypervisor/vsphere_helper_spec.rb
 - spec/beaker/hypervisor/vsphere_spec.rb
 - spec/beaker/logger_junit_spec.rb