beaker 2.19.0 → 2.20.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmIxNzA1NzI5Y2I5YjE1M2RkYTgyYTk3MTU1NDM5OWFmOWQ5YjRiMg==
+    ODkwNTk3ZWZmNDQ4MDc0YTVhYTk1OWJiYTU2Njc4YTAyYmM5NWUxZA==
   data.tar.gz: !binary |-
-    NGM4MDNjNTAyYWM3MGE5ZmRiZjg4MTY3ZDRiMzhkMmI3NGI2ZWZiNQ==
+    NDU1Y2QzYzUyNGU0ZWM3YzI2MmNiNGM3M2M1YjIyOTllNjQ2YTg2NQ==
 SHA512:
   metadata.gz: !binary |-
-    YjFkNTViOTBiM2NlZjhlMDQwMmJlYmI2ZmFmYWIxMGNmNTI3YjQ2NWEwMjk4
-    YzMxNjE2MzI0NDU1OWFmY2FiYTY3OGI5YzljY2E2M2NlNzg0YWYyMzhmZTFk
-    YjNjMmRhMzg2ZDVmZmNmNWEwYzAzODVjOTdlOWEzOTI2N2RiZDc=
+    MDAwZTY4MTZlNTQxMmMxNDVhMjRkOGVkYTQ2OGZhNjgzYjE2Y2FiNmY0ZGU2
+    Yzg0ZjI2OGY2ZjAzODQ2NjM0ZDczY2Y3OGYxMzM0NWI3YjM0MTgwNmJlZTRk
+    YmQ2NDcxNjI0ODA0Y2Q4NWEwYzYwYjk2Mzk5NGIyYTEzMTI1NDU=
   data.tar.gz: !binary |-
-    ZTJjZTQwMzRjZjI0NTExMzM1MTU1ZDQzOTg3ZTVlMjUwNGQzZGI4NGVjYWU3
-    MTAxYzFiZGVkMWIyZDcwZDc3NTBjMDg3NDBkNTMzMWQzNTEwY2QyYzJkMjdk
-    YjViZWUzNWFkNGE4NWIwNmFkZmUyMTY4ZTE1NmRlNDhiYzg4NmM=
+    ZDQ1MGM4ZmY0YzY3MGMzNTVjNWExZGZlMTM0MmUxNmZhNDNhM2U0ODliNjg4
+    ZDRmNjcyNTJjMzg3MGJlNDE1YzZkOWEwMjE0ZDIzMTc1MjJmYzc2ZjlmZDQ2
+    ZmIwOTAwODVhYWUwNzdmMjQ0ODJmNTkzYjJmZTJjMWJkOWEwZWQ=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 13 Aug, 2015 (821aefba)](#LATEST)
+* [LATEST - 17 Aug, 2015 (1d735a7a)](#LATEST)
+* [2.19.0 - 13 Aug, 2015 (80897129)](#2.19.0)
 * [2.18.3 - 28 Jul, 2015 (d9a02474)](#2.18.3)
 * [2.18.2 - 27 Jul, 2015 (c84f6f23)](#2.18.2)
 * [2.18.1 - 14 Jul, 2015 (6a82f99f)](#2.18.1)
@@ -91,7 +92,100 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 13 Aug, 2015 (821aefba)
+### <a name = "LATEST">LATEST - 17 Aug, 2015 (1d735a7a)
+
+* (GEM) update beaker version to 2.20.0 (1d735a7a)
+
+* Merge pull request #925 from objectverbobject/BKR-448 (d76d2a4a)
+
+
+```
+Merge pull request #925 from objectverbobject/BKR-448
+
+(BKR-448) Check for connection object during host.close
+```
+* Merge pull request #924 from anodelman/puppet-agent (ba4b3d4e)
+
+
+```
+Merge pull request #924 from anodelman/puppet-agent
+
+(BKR-447) Ubuntu PE puppet-agent urls not being generated correctly
+```
+* Merge pull request #904 from dylanratcliffe/add-per-node-memory (cc3d716a)
+
+
+```
+Merge pull request #904 from dylanratcliffe/add-per-node-memory
+
+(BKR-423) Added the ability to set CPUs and memory per node
+```
+* Merge pull request #923 from puppetlabs/bkr-428/change-assertion-in-teardown-behavior (5f60c353)
+
+
+```
+Merge pull request #923 from puppetlabs/bkr-428/change-assertion-in-teardown-behavior
+
+[BKR-428] gracefully handle assert failure in teardown
+```
+* (BKR-448) Check for connection object during host.close (255f43f6)
+
+
+```
+(BKR-448) Check for connection object during host.close
+
+The close method for hosts assumed the connection object existed when
+trying to set the hostname; this fix checks to ensure the connection
+object exists prior to calling any methods on it.
+```
+* (BKR-447) Ubuntu PE puppet-agent urls not being generated correctly (bb71b7ba)
+
+
+```
+(BKR-447) Ubuntu PE puppet-agent urls not being generated correctly
+
+- incorrectly adding additional '.' to ubuntu version strings that were
+  already correct
+- added spec test to ensure correct behavior
+- passed local testing
+```
+* Merge pull request #922 from anodelman/many-names (334d63a8)
+
+
+```
+Merge pull request #922 from anodelman/many-names
+
+(BKR-446) add ability to identify a host by vmhostname/ip
+```
+* (BKR-428) gracefully handle assert failure in teardown (f8b97d7b)
+
+
+```
+(BKR-428) gracefully handle assert failure in teardown
+
+Prior to this commit, if a teardown method ran code which contained assertions,
+and an assertion failed, the exception raised by the assertion failure was
+uncaught and beaker would crash.
+
+This change treats the assertion failure as a test failure and allows beaker
+to continue running.
+```
+* (BKR-446) add ability to identify a host by vmhostname/ip (24ecdf4b)
+
+
+```
+(BKR-446) add ability to identify a host by vmhostname/ip
+
+- make it possible to run commands like:
+
+on 'vmhostname', "command"
+on '0.0.0.0', "command"
+```
+* (BKR-423) Added the ability to set CPUs and memory per node (132b6b7e)
+
+### <a name = "2.19.0">2.19.0 - 13 Aug, 2015 (80897129)
+
+* (HISTORY) update beaker history for gem release 2.19.0 (80897129)
 
 * (GEM) update beaker version to 2.19.0 (821aefba)
 

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -1203,7 +1203,7 @@ module Beaker
               if arch == 'x86_64'
                 arch = 'amd64'
               end
-              version = version[0,2] + '.' + version[2,2] if variant =~ /ubuntu/ && version =~ /\.{0}/
+              version = version[0,2] + '.' + version[2,2] if (variant =~ /ubuntu/ && !version.include?("."))
               release_file = "/repos/apt/#{codename}/pool/#{opts[:puppet_collection]}/p/puppet-agent/puppet-agent*#{arch}.deb"
               download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
             when /^windows$/

data/lib/beaker/host.rb

@@ -243,11 +243,13 @@ module Beaker
     end
 
     def close
-      @connection.close if @connection
-      # update connection information
-      @connection.ip = self['ip'] if self['ip']
-      @connection.vmhostname = self['vmhostname'] if self['vmhostname']
-      @connection.hostname = @name
+      if @connection
+        @connection.close
+        # update connection information
+        @connection.ip         = self['ip'] if self['ip']
+        @connection.vmhostname = self['vmhostname'] if self['vmhostname']
+        @connection.hostname   = @name
+      end
       @connection = nil
     end
 

data/lib/beaker/hypervisor/vagrant_virtualbox.rb

@@ -16,9 +16,13 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
   end
 
   def self.provider_vfile_section(host, options)
+    # Allow memory and CPUs to be set at a per node level or overall, and take the most specific setting
+    host_memory = host['vagrant_memsize'] ? host['vagrant_memsize'] : (options['vagrant_memsize'] ? options['vagrant_memsize'] : 1024)
+    host_cpus = host['vagrant_cpus'] ? host['vagrant_cpus'] : (options['vagrant_cpus'] ? options['vagrant_cpus'] : 1)
+
     provider_section  = ""
     provider_section << "    v.vm.provider :virtualbox do |vb|\n"
-    provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{options['vagrant_memsize'] ||= '1024'}', '--cpus', '#{options['vagrant_cpus'] ||= '1'}']\n"
+    provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{host_memory}', '--cpus', '#{host_cpus}']\n"
     provider_section << "      vb.vbguest.auto_update = false" if options[:vbguest_plugin] == 'disable'
 
     # Guest volume support

data/lib/beaker/shared/host_manager.rb

@@ -17,13 +17,14 @@ module Beaker
         end
       end
 
-      #Find hosts from a given array of hosts that all have the desired name.
+      #Find hosts from a given array of hosts that all have the desired name, match against host name,
+      #vmhostname and ip (the three valid ways to identify an individual host)
       #@param [Array<Host>] hosts The hosts to examine
-      #@param [String] name The hosts returned will have this name
-      #@return [Array<Host>] The hosts that have the desired name
+      #@param [String] name The hosts returned will have this name/vmhostname/ip
+      #@return [Array<Host>] The hosts that have the desired name/vmhostname/ip
       def hosts_with_name(hosts, name = nil)
         hosts.select do |host|
-          name.nil? or host.name =~ /\A#{name}/
+          name.nil? or host.name =~ /\A#{name}/ or host[:vmhostname] =~ /\A#{name}/ or host[:ip] =~ /\A#{name}/
         end
       end
 

data/lib/beaker/test_case.rb

@@ -33,7 +33,7 @@ module Beaker
     # an instance of {Beaker::Logger}.
     attr_accessor :logger
 
-    # Necessary for many methods in {Beaker::DSL::Helpers}.  Assumed to be 
+    # Necessary for many methods in {Beaker::DSL::Helpers}.  Assumed to be
     # a hash.
     attr_accessor :metadata
 
@@ -139,7 +139,7 @@ module Beaker
               @teardown_procs.each do |teardown|
                 begin
                   teardown.call
-                rescue StandardError, SignalException => e
+                rescue StandardError, SignalException, TEST_EXCEPTION_CLASS => e
                   log_and_fail_test(e)
                 end
               end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.19.0'
+    STRING = '2.20.0'
   end
 end

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

@@ -912,7 +912,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' 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
@@ -927,6 +927,21 @@ describe ClassMixedWithDSLInstallUtils do
       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
 
   describe '#install_cert_on_windows' do

data/spec/beaker/host_spec.rb

@@ -649,5 +649,18 @@ module Beaker
       expect( "#{host}" ).to be === 'name'
     end
 
+    describe 'host close' do
+      context 'with a nil connection object' do
+        before do
+          conn = nil
+          host.instance_variable_set :@connection, conn
+          allow(host).to receive(:close).and_call_original
+        end
+        it 'does not raise an error' do
+          expect { host.close }.to_not raise_error
+        end
+      end
+    end
+
   end
 end

data/spec/beaker/shared/host_manager_spec.rb

@@ -15,7 +15,44 @@ module Beaker
                                hosts[2][:roles] = ['agent', role2]
                                hosts }
 
-      context "hosts_with_role" do
+      context "#hosts_with_name" do
+
+        it "can identify the host by name" do
+
+            expect( host_handler.hosts_with_name( hosts, 'vm1' )).to be === [hosts[0]]
+
+        end
+
+        it "can identify the host by vmhostname" do
+
+            hosts[0][:vmhostname] = 'myname.whatever'
+
+            expect( host_handler.hosts_with_name( hosts, 'myname.whatever' )).to be === [hosts[0]]
+
+        end
+
+        it "can identify the host by ip" do
+
+            hosts[0][:ip] = '0.0.0.0'
+
+            expect( host_handler.hosts_with_name( hosts, '0.0.0.0' )).to be === [hosts[0]]
+
+        end
+
+        it "returns [] when no match is found in a set of hosts" do
+
+            hosts[0][:ip] = '0.0.0.0'
+            hosts[0][:vmhostname] = 'myname.whatever'
+
+            expect( host_handler.hosts_with_name( hosts, 'surprise' )).to be === []
+
+        end
+
+
+
+      end
+
+      context "#hosts_with_role" do
         it "can find the master in a set of hosts" do
 
           expect( host_handler.hosts_with_role( hosts, 'master' ) ).to be === [hosts[1]]
@@ -36,7 +73,7 @@ module Beaker
 
       end
 
-      context "only_host_with_role" do
+      context "#only_host_with_role" do
         it "can find the single master in a set of hosts" do
 
           expect( host_handler.only_host_with_role( hosts, 'master' ) ).to be === hosts[1]
@@ -56,7 +93,7 @@ module Beaker
         end
       end
 
-      context "find_at_most_one_host_with_role" do
+      context "#find_at_most_one_host_with_role" do
         it "can find the single master in a set of hosts" do
 
           expect( host_handler.find_at_most_one_host_with_role( hosts, 'master' ) ).to be === hosts[1]
@@ -76,7 +113,7 @@ module Beaker
         end
       end
 
-      context "run_block_on" do
+      context "#run_block_on" do
         it "can execute a block against hosts identified by a string" do
           myhosts = host_handler.run_block_on( hosts, role0 ) do |hosts|
             hosts

data/spec/beaker/test_case_spec.rb

@@ -94,6 +94,20 @@ module Beaker
         expect( testcase ).to receive( :log_and_fail_test ).once.with(kind_of(Host::CommandFailure))
         testcase.run_test
       end
+
+      it 'records a test failure if an assertion fails in a teardown block' do
+        path = 'test.rb'
+        File.open(path, 'w') do |f|
+          f.write <<-EOF
+            teardown do
+              assert_equal(1, 2, 'Oh noes!')
+            end
+          EOF
+        end
+        @path = path
+        expect( testcase ).to receive( :log_and_fail_test ).once.with(kind_of(Minitest::Assertion))
+        testcase.run_test
+      end
     end
 
     context 'metadata' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.19.0
+  version: 2.20.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec