diff options
| -rw-r--r-- | lib/chef/data_bag_item.rb | 4 | ||||
| -rw-r--r-- | lib/chef/mixin/why_run.rb | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 8 | ||||
| -rw-r--r-- | spec/data/invalid-metadata-chef-repo/invalid-metadata/metadata.rb | 3 | ||||
| -rw-r--r-- | spec/functional/run_lock_spec.rb | 4 | ||||
| -rw-r--r-- | spec/unit/chef_fs/parallelizer.rb | 13 |
6 files changed, 16 insertions, 20 deletions
diff --git a/lib/chef/data_bag_item.rb b/lib/chef/data_bag_item.rb index 7ef9fffe07..b0713c298f 100644 --- a/lib/chef/data_bag_item.rb +++ b/lib/chef/data_bag_item.rb @@ -2,7 +2,7 @@ # Author:: Adam Jacob (<adam@opscode.com>) # Author:: Nuo Yan (<nuo@opscode.com>) # Author:: Christopher Brown (<cb@opscode.com>) -# Copyright:: Copyright (c) 2009 Opscode, Inc. +# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -163,7 +163,7 @@ class Chef end end - def destroy(data_bag=data_bag(), databag_item=name) + def destroy(data_bag=self.data_bag(), databag_item=name) chef_server_rest.delete("data/#{data_bag}/#{databag_item}") end diff --git a/lib/chef/mixin/why_run.rb b/lib/chef/mixin/why_run.rb index d3acea5490..3539ce1c5f 100644 --- a/lib/chef/mixin/why_run.rb +++ b/lib/chef/mixin/why_run.rb @@ -1,7 +1,7 @@ # # Author:: Dan DeLeo ( <dan@opscode.com> ) # Author:: Marc Paradise ( <marc@opscode.com> ) -# Copyright:: Copyright (c) 2012 Opscode, Inc. +# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -322,7 +322,7 @@ class Chef a.run(action, events, @resource) if a.assertion_failed? and a.block_action? @blocked_actions << action - return + break end end end diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index b452074e01..d1481c5ec7 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,16 +1,16 @@ GIT remote: git://github.com/chef/omnibus-software.git - revision: 7cbfe423d0720041c9007a0ddb15abc3b6480416 + revision: 1baba87d3fca8de9fbba0fb5971e116c6eee519e specs: omnibus-software (4.0.0) GIT remote: git://github.com/chef/omnibus.git - revision: b6422a3f9678a6f5cc145c9b0a488409ac0af73c + revision: 90a563f20be5526ddcb6d6290b0439af6ad10823 specs: omnibus (5.0.0) aws-sdk (~> 2) - chef-sugar (~> 3.0) + chef-sugar (~> 3.3) cleanroom (~> 1.0) mixlib-shellout (~> 2.0) mixlib-versioning @@ -63,7 +63,7 @@ GEM chef-config (12.6.0) mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) - chef-sugar (3.2.0) + chef-sugar (3.3.0) cleanroom (1.0.0) dep-selector-libgecode (1.0.2) dep_selector (1.0.3) diff --git a/spec/data/invalid-metadata-chef-repo/invalid-metadata/metadata.rb b/spec/data/invalid-metadata-chef-repo/invalid-metadata/metadata.rb index f548ad1dd8..1130ee40e8 100644 --- a/spec/data/invalid-metadata-chef-repo/invalid-metadata/metadata.rb +++ b/spec/data/invalid-metadata-chef-repo/invalid-metadata/metadata.rb @@ -1,5 +1,3 @@ -raise "THIS METADATA HAS A BUG" - name 'invalid-metadata' maintainer '' maintainer_email '' @@ -8,3 +6,4 @@ description 'Installs/Configures invalid-metadata' long_description 'Installs/Configures invalid-metadata' version '0.1.0' +raise "THIS METADATA HAS A BUG" diff --git a/spec/functional/run_lock_spec.rb b/spec/functional/run_lock_spec.rb index 78b3847d19..f3156ff770 100644 --- a/spec/functional/run_lock_spec.rb +++ b/spec/functional/run_lock_spec.rb @@ -1,6 +1,6 @@ # # Author:: Daniel DeLeo (<dan@opscode.com>) -# Copyright:: Copyright (c) 2012 Opscode, Inc. +# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -321,7 +321,7 @@ describe Chef::RunLock do attr_reader :pid def last_event - while true + loop do line = readline_nonblock(read_from_process) break if line.nil? event, time = line.split("@") diff --git a/spec/unit/chef_fs/parallelizer.rb b/spec/unit/chef_fs/parallelizer.rb index 9cb97963ed..3ca4ee0092 100644 --- a/spec/unit/chef_fs/parallelizer.rb +++ b/spec/unit/chef_fs/parallelizer.rb @@ -205,14 +205,11 @@ describe Chef::ChefFS::Parallelizer do started = false @occupying_job_finished = occupying_job_finished = [ false ] @thread = Thread.new do - begin - parallelizer.parallelize([0], :main_thread_processing => false) do |x| - started = true - sleep(0.3) - occupying_job_finished[0] = true - end.wait - ensure - end + parallelizer.parallelize([0], :main_thread_processing => false) do |x| + started = true + sleep(0.3) + occupying_job_finished[0] = true + end.wait end while !started sleep(0.01) |