diff options
author | Seth Chisamore <schisamo@chef.io> | 2018-10-25 15:39:30 -0400 |
---|---|---|
committer | Tim Smith <tsmith@chef.io> | 2018-10-29 09:21:37 -0700 |
commit | d7ac21b32743812158994beee53374d931b4e48f (patch) | |
tree | 3bb908d1753d5811dc9a803f8c30450b942085b4 | |
parent | 2abaafa58167863b5114021204e11f80d66b9cae (diff) | |
download | chef-d7ac21b32743812158994beee53374d931b4e48f.tar.gz |
Pull in spec fixes to support macOS 10.14
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | spec/functional/http/simple_spec.rb | 18 | ||||
-rw-r--r-- | spec/functional/resource/remote_file_spec.rb | 34 |
2 files changed, 31 insertions, 21 deletions
diff --git a/spec/functional/http/simple_spec.rb b/spec/functional/http/simple_spec.rb index 421045693a..a0fde94816 100644 --- a/spec/functional/http/simple_spec.rb +++ b/spec/functional/http/simple_spec.rb @@ -1,6 +1,6 @@ # # Author:: Lamont Granquist (<lamont@chef.io>) -# Copyright:: Copyright 2014-2016, Chef Software, Inc. +# Copyright:: Copyright 2014-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,13 +24,19 @@ describe Chef::HTTP::Simple do include ChefHTTPShared let(:http_client) { described_class.new(source) } - let(:http_client_disable_gzip) { described_class.new(source, { :disable_gzip => true } ) } + let(:http_client_disable_gzip) { described_class.new(source, { disable_gzip: true } ) } + + before(:all) do + start_tiny_server(RequestTimeout: 1) + end before(:each) do - start_tiny_server + Chef::Config[:rest_timeout] = 2 + Chef::Config[:http_retry_delay] = 1 + Chef::Config[:http_retry_count] = 2 end - after(:each) do + after(:all) do stop_tiny_server end @@ -46,10 +52,10 @@ describe Chef::HTTP::Simple do end shared_examples_for "validates content length and throws an exception" do - it "successfully downloads a streaming request" do + it "a streaming request throws a content length exception" do expect { http_client.streaming_request(source) }.to raise_error(Chef::Exceptions::ContentLengthMismatch) end - it "successfully does a non-streaming GET request" do + it "a non-streaming GET request throws a content length exception" do expect { http_client.get(source) }.to raise_error(Chef::Exceptions::ContentLengthMismatch) end end diff --git a/spec/functional/resource/remote_file_spec.rb b/spec/functional/resource/remote_file_spec.rb index 94c42a73ba..44a7a46d68 100644 --- a/spec/functional/resource/remote_file_spec.rb +++ b/spec/functional/resource/remote_file_spec.rb @@ -1,6 +1,6 @@ # # Author:: Seth Chisamore (<schisamo@chef.io>) -# Copyright:: Copyright 2011-2016, Chef Software Inc. +# Copyright:: Copyright 2011-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,6 +28,9 @@ describe Chef::Resource::RemoteFile do before(:each) do @old_file_cache = Chef::Config[:file_cache_path] Chef::Config[:file_cache_path] = file_cache_path + Chef::Config[:rest_timeout] = 2 + Chef::Config[:http_retry_delay] = 1 + Chef::Config[:http_retry_count] = 2 end after(:each) do @@ -55,11 +58,11 @@ describe Chef::Resource::RemoteFile do let(:default_mode) { (0666 & ~File.umask).to_s(8) } context "when fetching files over HTTP" do - before(:each) do - start_tiny_server + before(:all) do + start_tiny_server(RequestTimeout: 1) end - after(:each) do + after(:all) do stop_tiny_server end @@ -97,21 +100,22 @@ describe Chef::Resource::RemoteFile do context "when fetching files over HTTPS" do - before(:each) do + before(:all) do cert_text = File.read(File.expand_path("ssl/chef-rspec.cert", CHEF_SPEC_DATA)) cert = OpenSSL::X509::Certificate.new(cert_text) key_text = File.read(File.expand_path("ssl/chef-rspec.key", CHEF_SPEC_DATA)) key = OpenSSL::PKey::RSA.new(key_text) - server_opts = { :SSLEnable => true, - :SSLVerifyClient => OpenSSL::SSL::VERIFY_NONE, - :SSLCertificate => cert, - :SSLPrivateKey => key } + server_opts = { SSLEnable: true, + SSLVerifyClient: OpenSSL::SSL::VERIFY_NONE, + SSLCertificate: cert, + SSLPrivateKey: key, + RequestTimeout: 1 } start_tiny_server(server_opts) end - after(:each) do + after(:all) do stop_tiny_server end @@ -295,11 +299,11 @@ describe Chef::Resource::RemoteFile do end context "when dealing with content length checking" do - before(:each) do - start_tiny_server + before(:all) do + start_tiny_server(RequestTimeout: 1) end - after(:each) do + after(:all) do stop_tiny_server end @@ -356,7 +360,7 @@ describe Chef::Resource::RemoteFile do it "should raise ContentLengthMismatch" do expect { resource.run_action(:create) }.to raise_error(Chef::Exceptions::ContentLengthMismatch) - #File.should_not exist(path) # XXX: CHEF-5081 + # File.should_not exist(path) # XXX: CHEF-5081 end end @@ -369,7 +373,7 @@ describe Chef::Resource::RemoteFile do it "should raise ContentLengthMismatch" do expect { resource.run_action(:create) }.to raise_error(Chef::Exceptions::ContentLengthMismatch) - #File.should_not exist(path) # XXX: CHEF-5081 + # File.should_not exist(path) # XXX: CHEF-5081 end end |