Merge pull request #170 from swipely/fix-expects-and-container-run

Add 304 not modified expectation and remove start on run
upserve · Jul 24, 2014 · dd3b869 · dd3b869
2 parents ab8dfd2 + 25fd4df
commit dd3b869
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/docker/connection.rb b/lib/docker/connection.rb
@@ -77,7 +77,7 @@ def compile_request_params(http_method, path, query = nil, opts = nil, &block)
       :headers       => { 'Content-Type' => content_type,
                           'User-Agent'   => user_agent,
                         }.merge(headers),
-      :expects       => (200..204),
+      :expects       => (200..204).to_a << 304,
       :idempotent    => http_method == :get,
       :request_block => block
     }.merge(opts).reject { |_, v| v.nil? }

diff --git a/lib/docker/container.rb b/lib/docker/container.rb
@@ -26,7 +26,7 @@ def wait(time = nil)
   # UnexpectedResponseError is raised.
   def run(cmd, time = 1000)
     if (code = tap(&:start).wait(time)['StatusCode']).zero?
-      commit.run(cmd).tap(&:start)
+      commit.run(cmd)
     else
       raise UnexpectedResponseError, "Command returned status code #{code}."
     end