chef 12.8.1-universal-mingw32 → 12.9.38-universal-mingw32

data/spec/unit/mash_spec.rb

@@ -1,51 +1,51 @@
-#
-# Author:: Matthew Kent (<mkent@magoazul.com>)
-# Copyright:: Copyright 2011-2016, Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-require "chef/mash"
-
-describe Mash do
-  it "should duplicate a simple key/value mash to a new mash" do
-    data = { :x => "one", :y => "two", :z => "three" }
-    @orig = Mash.new(data)
-    @copy = @orig.dup
-    expect(@copy.to_hash).to eq(Mash.new(data).to_hash)
-    @copy[:x] = "four"
-    expect(@orig[:x]).to eq("one")
-  end
-
-  it "should duplicate a mash with an array to a new mash" do
-    data = { :x => "one", :y => "two", :z => [1, 2, 3] }
-    @orig = Mash.new(data)
-    @copy = @orig.dup
-    expect(@copy.to_hash).to eq(Mash.new(data).to_hash)
-    @copy[:z] << 4
-    expect(@orig[:z]).to eq([1, 2, 3])
-  end
-
-  it "should duplicate a nested mash to a new mash" do
-    data = { :x => "one", :y => "two", :z => Mash.new({ :a => [1, 2, 3] }) }
-    @orig = Mash.new(data)
-    @copy = @orig.dup
-    expect(@copy.to_hash).to eq(Mash.new(data).to_hash)
-    @copy[:z][:a] << 4
-    expect(@orig[:z][:a]).to eq([1, 2, 3])
-  end
-
-  # add more!
-end
+#
+# Author:: Matthew Kent (<mkent@magoazul.com>)
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+require "chef/mash"
+
+describe Mash do
+  it "should duplicate a simple key/value mash to a new mash" do
+    data = { :x => "one", :y => "two", :z => "three" }
+    @orig = Mash.new(data)
+    @copy = @orig.dup
+    expect(@copy.to_hash).to eq(Mash.new(data).to_hash)
+    @copy[:x] = "four"
+    expect(@orig[:x]).to eq("one")
+  end
+
+  it "should duplicate a mash with an array to a new mash" do
+    data = { :x => "one", :y => "two", :z => [1, 2, 3] }
+    @orig = Mash.new(data)
+    @copy = @orig.dup
+    expect(@copy.to_hash).to eq(Mash.new(data).to_hash)
+    @copy[:z] << 4
+    expect(@orig[:z]).to eq([1, 2, 3])
+  end
+
+  it "should duplicate a nested mash to a new mash" do
+    data = { :x => "one", :y => "two", :z => Mash.new({ :a => [1, 2, 3] }) }
+    @orig = Mash.new(data)
+    @copy = @orig.dup
+    expect(@copy.to_hash).to eq(Mash.new(data).to_hash)
+    @copy[:z][:a] << 4
+    expect(@orig[:z][:a]).to eq([1, 2, 3])
+  end
+
+  # add more!
+end

data/spec/unit/mixin/api_version_request_handling_spec.rb

@@ -1,126 +1,126 @@
-#
-# Author:: Tyler Cloke (tyler@chef.io)
-# Copyright:: Copyright 2015-2016, Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-
-describe Chef::Mixin::ApiVersionRequestHandling do
-  let(:dummy_class) { Class.new { include Chef::Mixin::ApiVersionRequestHandling } }
-  let(:object) { dummy_class.new }
-
-  describe ".server_client_api_version_intersection" do
-    let(:default_supported_client_versions) { [0, 1, 2] }
-
-    context "when the response code is not 406" do
-      let(:response) { OpenStruct.new(:code => "405") }
-      let(:exception) { Net::HTTPServerException.new("405 Something Else", response) }
-
-      it "returns nil" do
-        expect(object.server_client_api_version_intersection(exception, default_supported_client_versions)).
-          to be_nil
-      end
-
-    end # when the response code is not 406
-
-    context "when the response code is 406" do
-      let(:response) { OpenStruct.new(:code => "406") }
-      let(:exception) { Net::HTTPServerException.new("406 Not Acceptable", response) }
-
-      context "when x-ops-server-api-version header does not exist" do
-        it "returns nil" do
-          expect(object.server_client_api_version_intersection(exception, default_supported_client_versions)).
-            to be_nil
-        end
-      end # when x-ops-server-api-version header does not exist
-
-      context "when x-ops-server-api-version header exists" do
-        let(:min_server_version) { 2 }
-        let(:max_server_version) { 4 }
-        let(:return_hash) {
-          {
-            "min_version" => min_server_version,
-            "max_version" => max_server_version,
-          }
-        }
-
-        before(:each) do
-          allow(response).to receive(:[]).with("x-ops-server-api-version").and_return(Chef::JSONCompat.to_json(return_hash))
-        end
-
-        context "when there is no intersection between client and server versions" do
-          shared_examples_for "no intersection between client and server versions" do
-            it "return an array" do
-              expect(object.server_client_api_version_intersection(exception, supported_client_versions)).
-                to be_a_kind_of(Array)
-            end
-
-            it "returns an empty array" do
-              expect(object.server_client_api_version_intersection(exception, supported_client_versions).length).
-                to eq(0)
-            end
-
-          end
-
-          context "when all the versions are higher than the max" do
-            it_should_behave_like "no intersection between client and server versions" do
-              let(:supported_client_versions) { [5, 6, 7] }
-            end
-          end
-
-          context "when all the versions are lower than the min" do
-            it_should_behave_like "no intersection between client and server versions" do
-              let(:supported_client_versions) { [0, 1] }
-            end
-          end
-
-        end # when there is no intersection between client and server versions
-
-        context "when there is an intersection between client and server versions" do
-          context "when multiple versions intersect" do
-            let(:supported_client_versions) { [1, 2, 3, 4, 5] }
-
-            it "includes all of the intersection" do
-              expect(object.server_client_api_version_intersection(exception, supported_client_versions)).
-                to eq([2, 3, 4])
-            end
-          end # when multiple versions intersect
-
-          context "when only the min client version intersects" do
-            let(:supported_client_versions) { [0, 1, 2] }
-
-            it "includes the intersection" do
-              expect(object.server_client_api_version_intersection(exception, supported_client_versions)).
-                to eq([2])
-            end
-          end # when only the min client version intersects
-
-          context "when only the max client version intersects" do
-            let(:supported_client_versions) { [4, 5, 6] }
-
-            it "includes the intersection" do
-              expect(object.server_client_api_version_intersection(exception, supported_client_versions)).
-                to eq([4])
-            end
-          end # when only the max client version intersects
-
-        end # when there is an intersection between client and server versions
-
-      end # when x-ops-server-api-version header exists
-    end # when the response code is 406
-
-  end # .server_client_api_version_intersection
-end # Chef::Mixin::ApiVersionRequestHandling
+#
+# Author:: Tyler Cloke (tyler@chef.io)
+# Copyright:: Copyright 2015-2016, Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe Chef::Mixin::ApiVersionRequestHandling do
+  let(:dummy_class) { Class.new { include Chef::Mixin::ApiVersionRequestHandling } }
+  let(:object) { dummy_class.new }
+
+  describe ".server_client_api_version_intersection" do
+    let(:default_supported_client_versions) { [0, 1, 2] }
+
+    context "when the response code is not 406" do
+      let(:response) { OpenStruct.new(:code => "405") }
+      let(:exception) { Net::HTTPServerException.new("405 Something Else", response) }
+
+      it "returns nil" do
+        expect(object.server_client_api_version_intersection(exception, default_supported_client_versions)).
+          to be_nil
+      end
+
+    end # when the response code is not 406
+
+    context "when the response code is 406" do
+      let(:response) { OpenStruct.new(:code => "406") }
+      let(:exception) { Net::HTTPServerException.new("406 Not Acceptable", response) }
+
+      context "when x-ops-server-api-version header does not exist" do
+        it "returns nil" do
+          expect(object.server_client_api_version_intersection(exception, default_supported_client_versions)).
+            to be_nil
+        end
+      end # when x-ops-server-api-version header does not exist
+
+      context "when x-ops-server-api-version header exists" do
+        let(:min_server_version) { 2 }
+        let(:max_server_version) { 4 }
+        let(:return_hash) {
+          {
+            "min_version" => min_server_version,
+            "max_version" => max_server_version,
+          }
+        }
+
+        before(:each) do
+          allow(response).to receive(:[]).with("x-ops-server-api-version").and_return(Chef::JSONCompat.to_json(return_hash))
+        end
+
+        context "when there is no intersection between client and server versions" do
+          shared_examples_for "no intersection between client and server versions" do
+            it "return an array" do
+              expect(object.server_client_api_version_intersection(exception, supported_client_versions)).
+                to be_a_kind_of(Array)
+            end
+
+            it "returns an empty array" do
+              expect(object.server_client_api_version_intersection(exception, supported_client_versions).length).
+                to eq(0)
+            end
+
+          end
+
+          context "when all the versions are higher than the max" do
+            it_should_behave_like "no intersection between client and server versions" do
+              let(:supported_client_versions) { [5, 6, 7] }
+            end
+          end
+
+          context "when all the versions are lower than the min" do
+            it_should_behave_like "no intersection between client and server versions" do
+              let(:supported_client_versions) { [0, 1] }
+            end
+          end
+
+        end # when there is no intersection between client and server versions
+
+        context "when there is an intersection between client and server versions" do
+          context "when multiple versions intersect" do
+            let(:supported_client_versions) { [1, 2, 3, 4, 5] }
+
+            it "includes all of the intersection" do
+              expect(object.server_client_api_version_intersection(exception, supported_client_versions)).
+                to eq([2, 3, 4])
+            end
+          end # when multiple versions intersect
+
+          context "when only the min client version intersects" do
+            let(:supported_client_versions) { [0, 1, 2] }
+
+            it "includes the intersection" do
+              expect(object.server_client_api_version_intersection(exception, supported_client_versions)).
+                to eq([2])
+            end
+          end # when only the min client version intersects
+
+          context "when only the max client version intersects" do
+            let(:supported_client_versions) { [4, 5, 6] }
+
+            it "includes the intersection" do
+              expect(object.server_client_api_version_intersection(exception, supported_client_versions)).
+                to eq([4])
+            end
+          end # when only the max client version intersects
+
+        end # when there is an intersection between client and server versions
+
+      end # when x-ops-server-api-version header exists
+    end # when the response code is 406
+
+  end # .server_client_api_version_intersection
+end # Chef::Mixin::ApiVersionRequestHandling

data/spec/unit/mixin/checksum_spec.rb

@@ -1,40 +1,40 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2009-2016, Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-require "chef/mixin/checksum"
-require "stringio"
-
-class Chef::CMCCheck
-  include Chef::Mixin::Checksum
-end
-
-describe Chef::Mixin::Checksum do
-  before(:each) do
-    @checksum_user = Chef::CMCCheck.new
-    @cache = Chef::Digester.instance
-    @file = CHEF_SPEC_DATA + "/checksum/random.txt"
-    @stat = double("File::Stat", { :mtime => Time.at(0) })
-    allow(File).to receive(:stat).and_return(@stat)
-  end
-
-  it "gets the checksum of a file" do
-    expect(@checksum_user.checksum(@file)).to eq("09ee9c8cc70501763563bcf9c218d71b2fbf4186bf8e1e0da07f0f42c80a3394")
-  end
-
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2009-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+require "chef/mixin/checksum"
+require "stringio"
+
+class Chef::CMCCheck
+  include Chef::Mixin::Checksum
+end
+
+describe Chef::Mixin::Checksum do
+  before(:each) do
+    @checksum_user = Chef::CMCCheck.new
+    @cache = Chef::Digester.instance
+    @file = CHEF_SPEC_DATA + "/checksum/random.txt"
+    @stat = double("File::Stat", { :mtime => Time.at(0) })
+    allow(File).to receive(:stat).and_return(@stat)
+  end
+
+  it "gets the checksum of a file" do
+    expect(@checksum_user.checksum(@file)).to eq("09ee9c8cc70501763563bcf9c218d71b2fbf4186bf8e1e0da07f0f42c80a3394")
+  end
+
+end

data/spec/unit/mixin/command_spec.rb

@@ -1,104 +1,104 @@
-#
-# Author:: Hongli Lai (hongli@phusion.nl)
-# Copyright:: Copyright 2009-2016, Phusion
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-
-describe Chef::Mixin::Command, :volatile do
-
-  if windows?
-
-    skip("TODO MOVE: this is a platform specific integration test.")
-
-  else
-
-    describe "popen4" do
-      include Chef::Mixin::Command
-
-      it "should be possible to read the child process's stdout and stderr" do
-        popen4("sh -c 'echo hello && echo world >&2'") do |pid, stdin, stdout, stderr|
-          expect(stdout.read).to eq("hello\n")
-          expect(stderr.read).to eq("world\n")
-        end
-      end
-
-      it "should default all commands to be run in the POSIX standard C locale" do
-        popen4("echo $LC_ALL") do |pid, stdin, stdout, stderr|
-          expect(stdout.read.strip).to eq("C")
-        end
-      end
-
-      it "should respect locale when specified explicitly" do
-        popen4("echo $LC_ALL", :environment => { "LC_ALL" => "es" }) do |pid, stdin, stdout, stderr|
-          expect(stdout.read.strip).to eq("es")
-        end
-      end
-
-      it "should end when the child process reads from STDIN and a block is given" do
-        expect {Timeout.timeout(10) do
-          popen4("ruby -e 'while gets; end'", :waitlast => true) do |pid, stdin, stdout, stderr|
-            (1..5).each { |i| stdin.puts "#{i}" }
-          end
-        end
-        }.not_to raise_error
-      end
-
-      describe "when a process detaches but doesn't close STDOUT and STDERR [CHEF-584]" do
-
-        it "returns immediately after the first child process exits" do
-          expect {Timeout.timeout(10) do
-            evil_forker = "exit if fork; 10.times { sleep 1}"
-            popen4("ruby -e '#{evil_forker}'") do |pid, stdin, stdout, stderr|
-            end
-          end}.not_to raise_error
-        end
-
-      end
-
-    end
-
-    describe "run_command" do
-      include Chef::Mixin::Command
-
-      it "logs the command's stderr and stdout output if the command failed" do
-        allow(Chef::Log).to receive(:level).and_return(:debug)
-        begin
-          run_command(:command => "sh -c 'echo hello; echo world >&2; false'")
-          violated "Exception expected, but nothing raised."
-        rescue => e
-          expect(e.message).to match(/STDOUT: hello/)
-          expect(e.message).to match(/STDERR: world/)
-        end
-      end
-
-      describe "when a process detaches but doesn't close STDOUT and STDERR [CHEF-584]" do
-        it "returns successfully" do
-          # CHEF-2916 might have added a slight delay here, or our CI
-          # infrastructure is burdened. Bumping timeout from 2 => 4 --
-          # btm
-          # Serdar - During Solaris tests, we've seen that processes
-          # are taking a long time to exit. Bumping timeout now to 10.
-          expect {Timeout.timeout(10) do
-            evil_forker = "exit if fork; 10.times { sleep 1}"
-            run_command(:command => "ruby -e '#{evil_forker}'")
-          end}.not_to raise_error
-        end
-
-      end
-    end
-  end
-end
+#
+# Author:: Hongli Lai (hongli@phusion.nl)
+# Copyright:: Copyright 2009-2016, Phusion
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe Chef::Mixin::Command, :volatile do
+
+  if windows?
+
+    skip("TODO MOVE: this is a platform specific integration test.")
+
+  else
+
+    describe "popen4" do
+      include Chef::Mixin::Command
+
+      it "should be possible to read the child process's stdout and stderr" do
+        popen4("sh -c 'echo hello && echo world >&2'") do |pid, stdin, stdout, stderr|
+          expect(stdout.read).to eq("hello\n")
+          expect(stderr.read).to eq("world\n")
+        end
+      end
+
+      it "should default all commands to be run in the POSIX standard C locale" do
+        popen4("echo $LC_ALL") do |pid, stdin, stdout, stderr|
+          expect(stdout.read.strip).to eq("C")
+        end
+      end
+
+      it "should respect locale when specified explicitly" do
+        popen4("echo $LC_ALL", :environment => { "LC_ALL" => "es" }) do |pid, stdin, stdout, stderr|
+          expect(stdout.read.strip).to eq("es")
+        end
+      end
+
+      it "should end when the child process reads from STDIN and a block is given" do
+        expect {Timeout.timeout(10) do
+          popen4("ruby -e 'while gets; end'", :waitlast => true) do |pid, stdin, stdout, stderr|
+            (1..5).each { |i| stdin.puts "#{i}" }
+          end
+        end
+        }.not_to raise_error
+      end
+
+      describe "when a process detaches but doesn't close STDOUT and STDERR [CHEF-584]" do
+
+        it "returns immediately after the first child process exits" do
+          expect {Timeout.timeout(10) do
+            evil_forker = "exit if fork; 10.times { sleep 1}"
+            popen4("ruby -e '#{evil_forker}'") do |pid, stdin, stdout, stderr|
+            end
+          end}.not_to raise_error
+        end
+
+      end
+
+    end
+
+    describe "run_command" do
+      include Chef::Mixin::Command
+
+      it "logs the command's stderr and stdout output if the command failed" do
+        allow(Chef::Log).to receive(:level).and_return(:debug)
+        begin
+          run_command(:command => "sh -c 'echo hello; echo world >&2; false'")
+          violated "Exception expected, but nothing raised."
+        rescue => e
+          expect(e.message).to match(/STDOUT: hello/)
+          expect(e.message).to match(/STDERR: world/)
+        end
+      end
+
+      describe "when a process detaches but doesn't close STDOUT and STDERR [CHEF-584]" do
+        it "returns successfully" do
+          # CHEF-2916 might have added a slight delay here, or our CI
+          # infrastructure is burdened. Bumping timeout from 2 => 4 --
+          # btm
+          # Serdar - During Solaris tests, we've seen that processes
+          # are taking a long time to exit. Bumping timeout now to 10.
+          expect {Timeout.timeout(10) do
+            evil_forker = "exit if fork; 10.times { sleep 1}"
+            run_command(:command => "ruby -e '#{evil_forker}'")
+          end}.not_to raise_error
+        end
+
+      end
+    end
+  end
+end