summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@getchef.com>2014-06-05 13:06:19 -0700
committerBryan McLellan <btm@getchef.com>2014-06-05 13:06:19 -0700
commitac668fa85a3825489a41bad18f1908d0ff1e3662 (patch)
treec27f2615df0e769263a24818a05f3edb29fcd4da
parentff690278cd0e6bf5d552a59611be0a6a258128f2 (diff)
parent91d21738b123a0380dfe3c41cac24ce1714fd4d7 (diff)
downloadchef-ac668fa85a3825489a41bad18f1908d0ff1e3662.tar.gz
Merge branch 'CHEF-5152'
-rw-r--r--lib/chef/http/basic_client.rb1
-rw-r--r--spec/unit/http/basic_client_spec.rb42
2 files changed, 43 insertions, 0 deletions
diff --git a/lib/chef/http/basic_client.rb b/lib/chef/http/basic_client.rb
index e800112dbe..d26b675fbf 100644
--- a/lib/chef/http/basic_client.rb
+++ b/lib/chef/http/basic_client.rb
@@ -98,6 +98,7 @@ class Chef
end
http_client.read_timeout = config[:rest_timeout]
+ http_client.open_timeout = config[:rest_timeout]
http_client
end
diff --git a/spec/unit/http/basic_client_spec.rb b/spec/unit/http/basic_client_spec.rb
new file mode 100644
index 0000000000..4a81288131
--- /dev/null
+++ b/spec/unit/http/basic_client_spec.rb
@@ -0,0 +1,42 @@
+#
+# Author:: Cameron Cope (<ccope@brightcove.com>)
+# 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/http/basic_client'
+
+describe "HTTP Connection" do
+
+ let(:uri) { URI("https://example.com:4443") }
+ subject { Chef::HTTP::BasicClient.new(uri) }
+
+ describe ".new" do
+ it "creates an instance" do
+ subject
+ end
+ end
+
+ describe "#build_http_client" do
+ it "should build an http client" do
+ subject.build_http_client
+ end
+
+ it "should set an open timeout" do
+ subject.build_http_client.open_timeout.should_not be_nil
+ end
+ end
+end
+