beaker 2.41.0 → 2.42.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjUwYTZlZjRmMzlkZmVmMDg3ZjFjMTlkMDNiOGE5MjRhMDcwYmU2MQ==
+    MjU1MDAxYzhiZDg1YzJjZGUwMzJlYjJiM2Y4N2Y1NzY4MjFlNmFjYg==
   data.tar.gz: !binary |-
-    MjEzZWRjNTA4NzRiM2UwYmY0NjEyNjY1MWFmNTRlYWIzYmNlYWRlNw==
+    ZDA4MzRkYjEyYWM4YmFlNDE0ZjhlNWUxZTE2YWQ4ODMxZGIxNWIzZA==
 SHA512:
   metadata.gz: !binary |-
-    Y2QxZjA0NmNiMzQxMzIyMzkzMWIwMjk1OTFjN2NiYzU2Y2MzMjIyNTQ0M2U5
-    MDlmN2NkZDBkOTA1ZDlmN2VmZWMwMTUzOTY1ZmExN2QxZjE4OTJkM2I0YTM2
-    NzI4ZmZmYTdhNjQ3NzE3NmQ1M2IxYzk3NGFiZDljNTU1NjQ2NWM=
+    YWRlM2Q5ZjRkZmI0YTNmYTFlMTlhMDJhNmMzNTQxOWMwYWI0ODQ0OTZiN2M0
+    MzY4NGNhNDYxNWM0YjQ5MDcxYWQ4ZjI3MzU3YmRiNWI1ZTk5ODJiOTIxZjUw
+    NzBhODljYzBhOWRhZWRjNTZmOTJiMjVkYjdmMDMwYTNjZTg5M2Y=
   data.tar.gz: !binary |-
-    MjlmNzJkZTc2Zjc3MGZjMjNhYWQ4YmQ4MjM1YmE0NzA0MzIzYjYxMTU0Y2Y1
-    NTQ3NTk5MzZhNjJjZGVkMDAxZjY5NTJhNGFiNzg3ODhlMzRlMDAwZGY3NzJk
-    ODQ3ZjY1MTE1ZTI5ZWFkNDI4ODJkOGI4NTllNGExMzliMWU5NDI=
+    YzEyMDM5M2VlNDZlMjI2NDVjMWZhN2NkMWIwMDI0ZjljNGI5MjQ3OGZhZGMz
+    OGVlOGYyMjM4YWMzODBmMjc5ZjViNDNmZTk4MDg5NWQyNmIzMmE3NmIzNGQz
+    ZGEyZWQ1NmQxY2QzNDRmMzA2Yzc3YzAwYWNjNDBlMDU2MTg3ZWU=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 10 May, 2016 (859e8702)](#LATEST)
+* [LATEST - 23 May, 2016 (67b70d4a)](#LATEST)
+* [2.41.0 - 10 May, 2016 (17c745bd)](#2.41.0)
 * [2.40.0 - 18 Apr, 2016 (0a7b948a)](#2.40.0)
 * [2.39.0 - 6 Apr, 2016 (5976e103)](#2.39.0)
 * [2.38.1 - 31 Mar, 2016 (124b91b8)](#2.38.1)
@@ -117,7 +118,46 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 10 May, 2016 (859e8702)
+### <a name = "LATEST">LATEST - 23 May, 2016 (67b70d4a)
+
+* (GEM) update beaker version to 2.42.0 (67b70d4a)
+
+* Merge pull request #1120 from tvpartytonight/fix_assertion_method (f6bf5a19)
+
+
+```
+Merge pull request #1120 from tvpartytonight/fix_assertion_method
+
+(maint) Change spec test to use simplest assertion
+```
+* (maint) Change spec test to use simplest assertion (abd47084)
+
+
+```
+(maint) Change spec test to use simplest assertion
+
+Changes to minitest 5.9 broke a single test that used assert_equal to
+generate a minitest assertion; this change uses the simplest assertion
+possible, so changes to minitest are less likely to break a spec test.
+```
+* Merge pull request #1117 from pinkypie/BKR-688 (5eb17550)
+
+
+```
+Merge pull request #1117 from pinkypie/BKR-688
+
+(BKR-688) Moving confine message(s) up a level
+```
+* (BKR-688) Moving message stating that criteria match has been unsuccessful in finding a matching host, to the specific case logic. (fb597511)
+
+
+```
+(BKR-688) Moving message stating that criteria match has been unsuccessful in finding a matching host, to the specific case logic.
+This means that we can be more detailed in what exactly has failed to be found.
+```
+### <a name = "2.41.0">2.41.0 - 10 May, 2016 (17c745bd)
+
+* (HISTORY) update beaker history for gem release 2.41.0 (17c745bd)
 
 * (GEM) update beaker version to 2.41.0 (859e8702)
 

data/acceptance/tests/base/dsl/platform_tag_confiner_test.rb

@@ -26,7 +26,7 @@ test_name "DSL::Structure::PlatformTagConfiner" do
     begin
       tag( 'tag1' )
     rescue Beaker::DSL::Outcomes::SkipTest => e
-      if e.message =~ /^No\ suitable\ hosts\ found$/
+      if e.message =~ /^No\ suitable\ hosts\ found/
         # SkipTest is raised in the case when there are no hosts leftover for a test
         # after confining. It's a very common acceptance test case where all of the
         # hosts involved are of the same platform, and are thus all confined

data/acceptance/tests/base/dsl/structure_test.rb

@@ -76,4 +76,27 @@ test_name "dsl::structure" do
       assert_equal hosts.dup, hosts, "#confine_block did not preserve the hosts array"
     end
   end
+
+  step "#confine reports correct message and skips test when criteria doesn't match on 'to'" do
+    begin
+      confine :to, { :platform => 'test' }
+
+      fail "#confine did not skip test but should have."
+
+    rescue Beaker::DSL::Outcomes::SkipTest => e
+      assert_match /No suitable hosts found with {:platform=>"test"}/, e.message, "#confine raised an unexpected skip_test"
+    end
+  end
+
+  step "#confine reports correct message  and skips test when criteria doesn't match on 'except'" do
+    begin
+      confine :except, { :platform => default['platform'] }
+
+      fail "#confine did not skip test but should have."
+
+    rescue Beaker::DSL::Outcomes::SkipTest => e
+      assert_match /No suitable hosts found without {:platform=>"#{default['platform']}"}/, e.message, "#confine raised an unexpected
+      # skip_test"
+    end
+  end
 end

data/lib/beaker/dsl/structure.rb

@@ -200,19 +200,23 @@ module Beaker
             # confining to all hosts *except* provided array of hosts
             hosts_to_modify = hosts_not_modified
           end
+          if hosts_to_modify.empty?
+            logger.warn "No suitable hosts without: #{criteria.inspect}"
+            skip_test "No suitable hosts found without #{criteria.inspect}"
+          end
         when :to
           if criteria and ( not criteria.empty? )
             hosts_to_modify = select_hosts(criteria, hosts_to_modify, &block) + hosts_not_modified
           else
             # confining to only hosts in provided array of hosts
           end
+          if hosts_to_modify.empty?
+            logger.warn "No suitable hosts with: #{criteria.inspect}"
+            skip_test "No suitable hosts found with #{criteria.inspect}"
+          end
         else
           raise "Unknown option #{type}"
         end
-        if hosts_to_modify.empty?
-          logger.warn "No suitable hosts with: #{criteria.inspect}"
-          skip_test 'No suitable hosts found'
-        end
         self.hosts = hosts_to_modify
         hosts_to_modify
       end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.41.0'
+    STRING = '2.42.0'
   end
 end

data/spec/beaker/dsl/structure_spec.rb

@@ -94,7 +94,9 @@ describe ClassMixedWithDSLStructure 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') }
+      # We changed this lambda to use the simplest assert possible; using assert_equal
+      # caused an error in minitest 5.9.0 trying to write to the file system.
+      block = lambda { assert(false, 'this assertion should be caught') }
       expect{ subject.expect_failure 'this is an expected failure', &block }.to_not raise_error
     end
 
@@ -122,16 +124,22 @@ describe ClassMixedWithDSLStructure do
       allow( subject ).to receive( :logger ).and_return( logger )
     end
 
-    it 'skips the test if there are no applicable hosts' do
+    it ':to - skips the test if there are no applicable hosts' do
       allow( subject ).to receive( :hosts ).and_return( [] )
       allow( subject ).to receive( :hosts= )
       expect( logger ).to receive( :warn )
-      expect( subject ).to receive( :skip_test ).
-        with( 'No suitable hosts found' )
-
+      expect( subject ).to receive( :skip_test ).with( 'No suitable hosts found with {}' )
       subject.confine( :to, {} )
     end
 
+    it ':except - skips the test if there are no applicable hosts' do
+      allow( subject ).to receive( :hosts ).and_return( [] )
+      allow( subject ).to receive( :hosts= )
+      expect( logger ).to receive( :warn )
+      expect( subject ).to receive( :skip_test ).with( 'No suitable hosts found without {}' )
+      subject.confine( :except, {} )
+    end
+
     it ':to - uses a provided host subset when no criteria is provided' do
       subset = ['host1', 'host2']
       hosts = subset.dup << 'host3'
@@ -485,4 +493,4 @@ describe Beaker::DSL::Structure::PlatformTagConfiner do
       end
     end
   end
-end
+end

metadata

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