docker-api 1.23.0 → 1.24.0

data/spec/docker/event_spec.rb

@@ -20,40 +20,50 @@ describe Docker::Event do
   end
 
   describe ".stream" do
-    it 'receives three events', :vcr do
-      skip "get VCR to record events that break"
-      expect(Docker::Event).to receive(:new_event).exactly(3).times
+    let(:container) { Docker::Image.create('fromImage' => 'debian:wheezy').run('bash') }
+    it 'receives at least 4 events' do
+      expect(Docker::Event)
+        .to receive(:new_event)
+        .at_least(4).times
         .and_call_original
-      fork do
-        sleep 1
-        Docker::Image.create('fromImage' => 'debian:wheezy').run('bash')
-      end
-      Docker::Event.stream do |event|
-        puts "#{event}"
-        if event.status == "die"
-          break
+
+      stream_thread = Thread.new do
+        Docker::Event.stream do |event|
+          puts "#{event}"
         end
       end
+
+      stream_thread.join(0.1)
+      container.wait
+      stream_thread.join(10)
+      stream_thread.kill
+
+      container.remove
     end
   end
 
   describe ".since" do
-    let!(:time) { Time.now.to_i }
+    let(:time) { Time.now.to_i + 1 }
+    let(:container) { Docker::Image.create('fromImage' => 'debian:wheezy').run('bash') }
 
-    it 'receives three events', :vcr do
-      skip "get VCR to record events that break"
-      expect(Docker::Event).to receive(:new_event).exactly(3).times
+    it 'receives at least 4 events' do
+      expect(Docker::Event)
+        .to receive(:new_event)
+        .at_least(4).times
         .and_call_original
-      fork do
-        sleep 1
-        Docker::Image.create('fromImage' => 'debian:wheezy').run('bash')
-      end
-      Docker::Event.since(time) do |event|
-        puts "#{event}"
-        if event.status == "die"
-          break
+
+      stream_thread = Thread.new do
+        Docker::Event.since(time) do |event|
+          puts "#{event}"
         end
       end
+
+      stream_thread.join(0.1)
+      container.wait
+      stream_thread.join(10)
+      stream_thread.kill
+
+      container.remove
     end
   end
 

data/spec/docker/exec_spec.rb

@@ -47,7 +47,7 @@ describe Docker::Exec do
       let(:process) { subject.create(options) }
       after { container.kill!.remove }
 
-      it 'sets the id', :vcr do
+      it 'sets the id' do
         expect(process).to be_a Docker::Exec
         expect(process.id).to_not be_nil
         expect(process.connection).to_not be_nil
@@ -83,7 +83,7 @@ describe Docker::Exec do
     before { subject.start! }
     after { container.kill!.remove }
 
-    it 'returns the description as a Hash', :vcr do
+    it 'returns the description as a Hash' do
       expect(description).to be_a Hash
       expect(description['ID']).to start_with(subject.id)
     end
@@ -95,8 +95,7 @@ describe Docker::Exec do
         described_class.send(:new, Docker.connection, 'id' => rand(10000).to_s)
       end
 
-      it 'raises an error', :vcr do
-        skip 'The Docker API returns a 200 (docker/docker#9341)'
+      it 'raises an error' do
         expect { subject.start! }.to raise_error(Docker::Error::NotFoundError)
       end
     end
@@ -111,12 +110,12 @@ describe Docker::Exec do
       }
       after { container.kill!.remove }
 
-      it 'returns the stdout and stderr messages', :vcr do
+      it 'returns the stdout and stderr messages' do
         expect(subject.start!).to eq([["hello\n"],[],0])
       end
 
       context 'block is passed' do
-        it 'attaches to the stream', :vcr do
+        it 'attaches to the stream' do
           chunk = nil
           result = subject.start! do |stream, c|
             chunk ||= c
@@ -133,7 +132,7 @@ describe Docker::Exec do
       }
       after { container.kill!.remove }
 
-      it 'returns empty stdout/stderr messages with exitcode', :vcr do
+      it 'returns empty stdout/stderr messages with exitcode' do
         expect(subject.start!(:detach => true)).to eq([[],[], 0])
       end
     end
@@ -144,7 +143,7 @@ describe Docker::Exec do
       }
       after { container.kill!.remove }
 
-      it 'returns empty stdout and stderr messages with exitcode', :vcr do
+      it 'returns empty stdout and stderr messages with exitcode' do
         expect(subject.start!(:wait => 100)).to eq([[], [], 0])
       end
     end
@@ -159,32 +158,18 @@ describe Docker::Exec do
       }
       after { container.kill!.remove }
 
-      it 'raises an error', :vcr do
-        pending "VCR doesn't like to record errors"
+      it 'raises an error' do
         expect { subject.start!(:wait => 1) }.to raise_error(Docker::Error::TimeoutError)
       end
     end
 
-    context 'when the command has already run' do
-      subject {
-        described_class.create('Container' => container.id, 'Cmd' => ['date'])
-      }
-      before { subject.start! }
-      after { container.kill!.remove }
-
-      it 'raises an error', :vcr do
-        skip 'The Docker API returns a 200 (docker/docker#9341)'
-        expect { subject.start! }.to raise_error(Docker::Error::NotFoundError)
-      end
-    end
-
     context 'when the HTTP request returns a 201' do
       subject {
         described_class.create('Container' => container.id, 'Cmd' => ['date'])
       }
       after { container.kill!.remove }
 
-      it 'starts the exec instance', :vcr do
+      it 'starts the exec instance' do
         expect { subject.start! }.not_to raise_error
       end
     end

data/spec/docker/image_spec.rb

@@ -24,9 +24,10 @@ describe Docker::Image do
 
     context 'when no name is given' do
       let(:id) { subject.id }
-      subject { described_class.create('fromImage' => 'busybox') }
+      subject { described_class.create('fromImage' => 'busybox:latest') }
+      after { described_class.create('fromImage' => 'busybox:latest') }
 
-      it 'removes the Image', :vcr do
+      it 'removes the Image' do
         subject.remove(:force => true)
         expect(Docker::Image.all.map(&:id)).to_not include(id)
       end
@@ -56,7 +57,7 @@ describe Docker::Image do
     context 'when the local file does not exist' do
       let(:file) { '/lol/not/a/file' }
 
-      it 'raises an error', :vcr do
+      it 'raises an error' do
         expect { new_image }.to raise_error(Docker::Error::ArgumentError)
       end
     end
@@ -64,13 +65,13 @@ describe Docker::Image do
     context 'when the local file does exist' do
       let(:file) { File.join(project_dir, 'Gemfile') }
       let(:gemfile) { File.read('Gemfile') }
-      let(:container) { new_image.run('cat /Gemfile') }
+      let(:container) { new_image.run('cat /Gemfile').tap(&:wait) }
       after do
-        container.tap(&:wait).remove
+        container.remove
         new_image.remove
       end
 
-      it 'creates a new Image that has that file', :vcr do
+      it 'creates a new Image that has that file' do
         output = container.streaming_logs(stdout: true)
         expect(output).to eq(gemfile)
       end
@@ -90,7 +91,7 @@ describe Docker::Image do
         new_image.remove
       end
 
-      it 'inserts the directory', :vcr do
+      it 'inserts the directory' do
         expect(response.split("\n").sort).to eq(Dir.entries('lib/docker').sort)
       end
     end
@@ -103,14 +104,14 @@ describe Docker::Image do
       let(:license) { File.read('LICENSE') }
       let(:container) { new_image.run('cat /Gemfile /LICENSE') }
       let(:response) {
-        container.streaming_logs(stdout: true)
+        container.tap(&:wait).streaming_logs(stdout: true)
       }
       after do
-        container.tap(&:wait).remove
+        container.remove
         new_image.remove
       end
 
-      it 'creates a new Image that has each file', :vcr do
+      it 'creates a new Image that has each file' do
         expect(response).to eq("#{gemfile}#{license}")
       end
     end
@@ -120,13 +121,13 @@ describe Docker::Image do
       let(:file) { File.join(project_dir, 'Gemfile') }
       after(:each) { new_image.remove }
 
-      it 'leave no intermediate containers', :vcr do
+      it 'leave no intermediate containers' do
         expect { new_image }.to change {
           Docker::Container.all(:all => true).count
         }.by 0
       end
 
-      it 'creates a new image', :vcr do
+      it 'creates a new image' do
         expect{new_image}.to change{Docker::Image.all.count}.by 1
       end
     end
@@ -147,13 +148,13 @@ describe Docker::Image do
     }
     after { image.remove(:name => repo_tag, :noprune => true) }
 
-    it 'pushes the Image', :vcr do
+    it 'pushes the Image' do
       image.push(credentials)
     end
 
-    it 'streams output from push', :vcr do
+    it 'streams output from push' do
       expect { |b| image.push(credentials, &b) }
-        .to yield_control
+        .to yield_control.at_least(1)
     end
 
     context 'when a tag is specified' do
@@ -167,7 +168,7 @@ describe Docker::Image do
       }
 
       context 'when no tag is specified' do
-        it 'looks up the first repo tag', :vcr do
+        it 'looks up the first repo tag' do
           expect { image.push }.to_not raise_error
         end
       end
@@ -177,7 +178,7 @@ describe Docker::Image do
       let(:credentials) { nil }
       let(:repo_tag) { "localhost:5000/true" }
 
-      it 'still pushes', :vcr do
+      it 'still pushes' do
         expect { image.push }.to_not raise_error
       end
     end
@@ -187,7 +188,7 @@ describe Docker::Image do
     subject { described_class.create('fromImage' => 'debian:wheezy') }
     after { subject.remove(:name => 'teh:latest', :noprune => true) }
 
-    it 'tags the image with the repo name', :vcr do
+    it 'tags the image with the repo name' do
       subject.tag(:repo => :teh, :force => true)
       expect(subject.info['RepoTags']).to include 'teh:latest'
     end
@@ -197,7 +198,7 @@ describe Docker::Image do
     subject { described_class.create('fromImage' => 'debian:wheezy') }
     let(:json) { subject.json }
 
-    it 'returns additional information about image image', :vcr do
+    it 'returns additional information about image image' do
       expect(json).to be_a Hash
       expect(json.length).to_not be_zero
     end
@@ -207,7 +208,7 @@ describe Docker::Image do
     subject { described_class.create('fromImage' => 'debian:wheezy') }
     let(:history) { subject.history }
 
-    it 'returns the history of the Image', :vcr do
+    it 'returns the history of the Image' do
       expect(history).to be_a Array
       expect(history.length).to_not be_zero
       expect(history).to be_all { |elem| elem.is_a? Hash }
@@ -216,32 +217,31 @@ describe Docker::Image do
 
   describe '#run' do
     subject { described_class.create('fromImage' => 'debian:wheezy') }
-    let(:container) { subject.run(cmd) }
+    let(:container) { subject.run(cmd).tap(&:wait) }
     let(:output) { container.streaming_logs(stdout: true) }
 
-    context 'when the argument is a String', :vcr do
+    context 'when the argument is a String' do
       let(:cmd) { 'ls /lib64/' }
       after { container.remove }
 
       it 'splits the String by spaces and creates a new Container' do
-        container.wait
         expect(output).to eq("ld-linux-x86-64.so.2\n")
       end
     end
 
     context 'when the argument is an Array' do
       let(:cmd) { %w[which pwd] }
-      after { container.tap(&:wait).remove }
+      after { container.remove }
 
-      it 'creates a new Container', :vcr do
+      it 'creates a new Container' do
         expect(output).to eq("/bin/pwd\n")
       end
     end
 
-    context 'when the argument is nil', :vcr  do
+    context 'when the argument is nil'  do
       let(:cmd) { nil }
       context 'no command configured in image' do
-        subject { described_class.create('fromImage' => 'scratch') }
+        subject { described_class.create('fromImage' => 'swipely/base') }
         it 'should raise an error if no command is specified' do
           expect {container}.to raise_error(Docker::Error::ServerError,
                                          "No command specified.")
@@ -253,7 +253,6 @@ describe Docker::Image do
         after { container.remove }
 
         it 'should normally show result if image has Cmd configured' do
-          container.wait
           expect(output).to eql "/\n"
         end
       end
@@ -263,7 +262,7 @@ describe Docker::Image do
   describe '#save' do
     let(:image) { Docker::Image.get('busybox') }
 
-    it 'calls the class method', :vcr do
+    it 'calls the class method' do
       expect(Docker::Image).to receive(:save)
         .with(image.id, 'busybox.tar', anything)
       image.save('busybox.tar')
@@ -273,7 +272,7 @@ describe Docker::Image do
   describe '#refresh!' do
     let(:image) { Docker::Image.create('fromImage' => 'debian:wheezy') }
 
-    it 'updates the @info hash', :vcr do
+    it 'updates the @info hash' do
       size = image.info.size
       image.refresh!
       expect(image.info.size).to be > size
@@ -285,11 +284,7 @@ describe Docker::Image do
         Docker::Image.create({'fromImage' => 'debian:wheezy'}, nil, connection)
       }
 
-      it 'updates using the provided connection', :vcr do
-        expect(connection).to receive(:get)
-          .with('/images/json', all: true).ordered
-        expect(connection).to receive(:get)
-          .with("/images/#{image.id}/json", {}).ordered.and_call_original
+      it 'updates using the provided connection' do
         image.refresh!
       end
     end
@@ -299,7 +294,7 @@ describe Docker::Image do
     subject { described_class }
 
     context 'when the Image does not yet exist and the body is a Hash' do
-      let(:image) { subject.create('fromImage' => 'swipely/scratch') }
+      let(:image) { subject.create('fromImage' => 'swipely/base') }
       let(:creds) {
         {
           :username => ENV['DOCKER_API_USER'],
@@ -308,28 +303,33 @@ describe Docker::Image do
         }
       }
 
-      before { Docker.creds = creds }
-      after { image.remove(:name => 'swipely/scratch', :noprune => true) }
+      before do
+        Docker::Image.create('fromImage' => 'swipely/base').remove
+      end
+      after { Docker::Image.create('fromImage' => 'swipely/base') }
 
-      it 'sets the id and sends Docker.creds', :vcr do
+      it 'sets the id and sends Docker.creds' do
+        allow(Docker).to receive(:creds).and_return(creds)
         expect(image).to be_a Docker::Image
         expect(image.id).to match(/\A[a-fA-F0-9]+\Z/)
         expect(image.id).to_not include('base')
         expect(image.id).to_not be_nil
         expect(image.id).to_not be_empty
-        expect(image.info[:headers].keys).to include 'X-Registry-Auth'
       end
     end
 
     context 'with a block capturing create output' do
       let(:create_output) { "" }
       let(:block) { Proc.new { |chunk| create_output << chunk } }
-      let!(:image) { subject.create('fromImage' => 'tianon/true', &block) }
 
-      before { Docker.creds = nil }
+      before do
+        Docker.creds = nil
+        subject.create('fromImage' => 'tianon/true').remove
+      end
 
-      it 'calls the block and passes build output', :vcr do
-        expect(create_output).to match(/Pulling repository tianon\/true/)
+      it 'calls the block and passes build output' do
+        subject.create('fromImage' => 'tianon/true', &block)
+        expect(create_output).to match(/Pulling.*tianon\/true/)
       end
     end
   end
@@ -341,7 +341,7 @@ describe Docker::Image do
     context 'when the image does exist' do
       let(:image_name) { 'debian:wheezy' }
 
-      it 'returns the new image', :vcr do
+      it 'returns the new image' do
         expect(image).to be_a Docker::Image
       end
     end
@@ -359,7 +359,7 @@ describe Docker::Image do
         Excon.stubs.shift
       end
 
-      it 'raises a not found error', :vcr do
+      it 'raises a not found error' do
         expect { image }.to raise_error(Docker::Error::NotFoundError)
       end
     end
@@ -372,16 +372,16 @@ describe Docker::Image do
       let(:file) { "#{project_dir}/scratch.tar" }
       after { FileUtils.remove(file) }
 
-      it 'exports tarball of image to specified file', :vcr do
-        Docker::Image.save('scratch', file)
+      it 'exports tarball of image to specified file' do
+        Docker::Image.save('swipely/base', file)
         expect(File.exist?(file)).to eq true
         expect(File.read(file)).to_not be_nil
       end
     end
 
     context 'when no filename is specified' do
-      it 'returns raw binary data as string', :vcr do
-        raw = Docker::Image.save('scratch:latest')
+      it 'returns raw binary data as string' do
+        raw = Docker::Image.save('swipely/base')
         expect(raw).to_not be_nil
       end
     end
@@ -394,7 +394,7 @@ describe Docker::Image do
     context 'when the image does exist' do
       let(:image_name) { 'debian:wheezy' }
 
-      it 'returns true', :vcr do
+      it 'returns true' do
         expect(exists).to eq(true)
       end
     end
@@ -412,7 +412,7 @@ describe Docker::Image do
         Excon.stubs.shift
       end
 
-      it 'return false', :vcr do
+      it 'return false' do
         expect(exists).to eq(false)
       end
     end
@@ -437,7 +437,7 @@ describe Docker::Image do
       let(:import) { subject.import(file) }
       after { import.remove(:noprune => true) }
 
-      it 'creates the Image', :vcr do
+      it 'creates the Image' do
         expect(import).to be_a Docker::Image
         expect(import.id).to_not be_nil
       end
@@ -445,7 +445,7 @@ describe Docker::Image do
 
     context 'when the argument is a URI' do
       context 'when the URI is invalid' do
-        it 'raises an error', :vcr do
+        it 'raises an error' do
           expect { subject.import('http://google.com') }
             .to raise_error(Docker::Error::IOError)
         end
@@ -456,7 +456,7 @@ describe Docker::Image do
         let(:import) { subject.import(uri) }
         after { import.remove(:noprune => true) }
 
-        it 'returns an Image', :vcr do
+        it 'returns an Image' do
           expect(import).to be_a Docker::Image
           expect(import.id).to_not be_nil
         end
@@ -470,7 +470,7 @@ describe Docker::Image do
     let(:images) { subject.all(:all => true) }
     before { subject.create('fromImage' => 'debian:wheezy') }
 
-    it 'materializes each Image into a Docker::Image', :vcr do
+    it 'materializes each Image into a Docker::Image' do
       images.each do |image|
         expect(image).to_not be_nil
 
@@ -490,7 +490,7 @@ describe Docker::Image do
   describe '.search' do
     subject { described_class }
 
-    it 'materializes each Image into a Docker::Image', :vcr do
+    it 'materializes each Image into a Docker::Image' do
       expect(subject.search('term' => 'sshd')).to be_all { |image|
         !image.id.nil? && image.is_a?(described_class)
       }
@@ -500,7 +500,7 @@ describe Docker::Image do
   describe '.build' do
     subject { described_class }
     context 'with an invalid Dockerfile' do
-      it 'throws a UnexpectedResponseError', :vcr do
+      it 'throws a UnexpectedResponseError' do
         expect { subject.build('lololol') }
             .to raise_error(Docker::Error::UnexpectedResponseError)
       end
@@ -510,7 +510,7 @@ describe Docker::Image do
       context 'without query parameters' do
         let(:image) { subject.build("FROM debian:wheezy\n") }
 
-        it 'builds an image', :vcr do
+        it 'builds an image' do
           expect(image).to be_a Docker::Image
           expect(image.id).to_not be_nil
           expect(image.connection).to be_a Docker::Connection
@@ -526,7 +526,7 @@ describe Docker::Image do
         }
         after { image.remove(:noprune => true) }
 
-        it 'builds an image and tags it', :vcr do
+        it 'builds an image and tags it' do
           expect(image).to be_a Docker::Image
           expect(image.id).to_not be_nil
           expect(image.connection).to be_a Docker::Connection
@@ -542,8 +542,8 @@ describe Docker::Image do
         let(:block) { Proc.new { |chunk| build_output << chunk } }
         let!(:image) { subject.build("FROM debian:wheezy\n", &block) }
 
-        it 'calls the block and passes build output', :vcr do
-          expect(build_output).to match(/Step 0 : FROM debian:wheezy/)
+        it 'calls the block and passes build output' do
+          expect(build_output).to match(/Step \d : FROM debian:wheezy/)
         end
       end
     end
@@ -561,49 +561,42 @@ describe Docker::Image do
       let(:opts) { {} }
       let(:block) { Proc.new {} }
       let(:container) do
-        Docker::Container.create('Image' => image.id,
-                                 'Cmd' => %w[cat /Dockerfile])
+        Docker::Container.create(
+          'Image' => image.id,
+          'Cmd' => %w[cat /Dockerfile]
+        ).tap(&:start).tap(&:wait)
       end
       let(:output) { container.streaming_logs(stdout: true) }
 
       after(:each) do
+        container.remove
         image.remove(:noprune => true)
       end
 
       context 'with no query parameters' do
-        it 'builds the image', :vcr do
-          container.tap(&:wait).start
+        it 'builds the image' do
           expect(output).to eq(docker_file.read)
         end
-
-        after do
-          container.remove
-        end
       end
 
       context 'with specifying a repo in the query parameters' do
         let(:opts) { { "t" => "#{ENV['DOCKER_API_USER']}/debian:from_dir" } }
-        it 'builds the image and tags it', :vcr do
-          container.tap(&:wait).start
+        it 'builds the image and tags it' do
           expect(output).to eq(docker_file.read)
           image.refresh!
           expect(image.info["RepoTags"]).to eq(
             ["#{ENV['DOCKER_API_USER']}/debian:from_dir"]
           )
         end
-
-        after do
-          container.remove
-        end
       end
 
       context 'with a block capturing build output' do
         let(:build_output) { "" }
         let(:block) { Proc.new { |chunk| build_output << chunk } }
 
-        it 'calls the block and passes build output', :vcr do
+        it 'calls the block and passes build output' do
           image # Create the image variable, which is lazy-loaded by Rspec
-          expect(build_output).to match(/Step 0 : FROM debian:wheezy/)
+          expect(build_output).to match(/Step \d : FROM debian:wheezy/)
         end
 
         context 'uses a cached version the second time' do
@@ -611,9 +604,9 @@ describe Docker::Image do
           let(:block_two) { Proc.new { |chunk| build_output_two << chunk } }
           let(:image_two) { subject.build_from_dir(dir, opts, &block_two) }
 
-          it 'calls the block and passes build output', :vcr do
+          it 'calls the block and passes build output' do
             image # Create the image variable, which is lazy-loaded by Rspec
-            expect(build_output).to match(/Step 0 : FROM debian:wheezy/)
+            expect(build_output).to match(/Step \d : FROM debian:wheezy/)
             expect(build_output).to_not match(/Using cache/)
 
             image_two # Create the image_two variable, which is lazy-loaded by Rspec
@@ -633,8 +626,9 @@ describe Docker::Image do
         }
 
         before { Docker.creds = creds }
+        after { Docker.creds = nil }
 
-        it 'sends X-Registry-Config header', :vcr do
+        it 'sends X-Registry-Config header' do
           expect(image.info[:headers].keys).to include('X-Registry-Config')
         end
       end