td-client 0.8.85 → 0.9.0dev1

data/spec/td/client/import_api_spec.rb

@@ -8,47 +8,24 @@ describe 'Import API' do
   include_context 'common helper'
 
   let :api do
-    API.new(nil, :endpoint => endpoint)
+    API.new(nil, :endpoint => 'https://api.treasuredata.com')
   end
 
   let :api_old do
-    API.new(nil, :endpoint => endpoint_old)
+    API.new(nil, :endpoint => 'http://api.treasure-data.com')
   end
 
-  let :api_default do
-    API.new(nil)
-  end
-
-  let :api_default_http do
-    API.new(nil, :ssl => false)
-  end
-
-  let :api_unknown_host do
-    API.new(nil, :endpoint => endpoint_unknown)
-  end
-
-  let :api_unknown_host_http do
-    API.new(nil, :endpoint => endpoint_unknown, :ssl => false)
-  end
-
-  let(:endpoint) { 'api.treasuredata.com' }
-  let(:endpoint_old) { TreasureData::API::OLD_ENDPOINT }
-  let(:endpoint_unknown) { "example.com" }
-  let(:endpoint_import) { "api-import.treasuredata.com" }
-  let(:endpoint_import_old) { "api-import.treasure-data.com" }
-  let(:endpoint_import_unknown) { endpoint_unknown }
-
   describe 'import' do
     it 'runs with unique_id' do
       t = Tempfile.new('import_api_spec')
       File.open(t.path, 'w') do |f|
         f << '12345'
       end
-      stub_request(:put, "https://#{endpoint_import}/v3/table/import_with_id/db/table/unique_id/format").
+      stub_request(:put, "https://api-import.treasuredata.com/v3/table/import_with_id/db/table/unique_id/format").
         with(:body => '12345').
         to_return(:body => '{"elapsed_time":"1.23"}')
       File.open(t.path) do |f|
-        expect(api.import('db', 'table', 'format', f, 5, 'unique_id')).to eq(1.23)
+        api.import('db', 'table', 'format', f, 5, 'unique_id').should == 1.23
       end
     end
 
@@ -57,76 +34,24 @@ describe 'Import API' do
       File.open(t.path, 'w') do |f|
         f << '12345'
       end
-      stub_request(:put, "https://#{endpoint_import}/v3/table/import/db/table/format").
-        with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
-      File.open(t.path) do |f|
-        expect(api.import('db', 'table', 'format', f, 5)).to eq(1.23)
-      end
-    end
-
-    it 'runs for old endpoint (force "http" instead of "https" for compatibility)' do
-      t = Tempfile.new('import_api_spec')
-      File.open(t.path, 'w') do |f|
-        f << '12345'
-      end
-      stub_request(:put, "http://#{endpoint_import_old}/v3/table/import/db/table/format").
-        with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
-      File.open(t.path) do |f|
-        expect(api_old.import('db', 'table', 'format', f, 5)).to eq(1.23)
-      end
-    end
-
-    it 'runs for no endpoint specified (default behavior)' do
-      t = Tempfile.new('import_api_spec')
-      File.open(t.path, 'w') do |f|
-        f << '12345'
-      end
-      stub_request(:put, "https://#{endpoint_import}/v3/table/import/db/table/format").
-        with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
-      File.open(t.path) do |f|
-        expect(api_default.import('db', 'table', 'format', f, 5)).to eq 1.23
-      end
-    end
-
-    it 'runs for no endpoint specified with ssl: false' do
-      t = Tempfile.new('import_api_spec')
-      File.open(t.path, 'w') do |f|
-        f << '12345'
-      end
-      stub_request(:put, "http://#{endpoint_import}/v3/table/import/db/table/format").
-        with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
-      File.open(t.path) do |f|
-        expect(api_default_http.import('db', 'table', 'format', f, 5)).to eq 1.23
-      end
-    end
-
-    it 'runs for unknown endpoint specified' do
-      t = Tempfile.new('import_api_spec')
-      File.open(t.path, 'w') do |f|
-        f << '12345'
-      end
-      stub_request(:put, "https://#{endpoint_unknown}/v3/table/import/db/table/format").
+      stub_request(:put, "https://api-import.treasuredata.com/v3/table/import/db/table/format").
         with(:body => '12345').
         to_return(:body => '{"elapsed_time":"1.23"}')
       File.open(t.path) do |f|
-        expect(api_unknown_host.import('db', 'table', 'format', f, 5)).to eq 1.23
+        api.import('db', 'table', 'format', f, 5).should == 1.23
       end
     end
 
-    it 'runs for unknown endpoint with ssl=false specified' do
+    it 'runs for old endpoint' do
       t = Tempfile.new('import_api_spec')
       File.open(t.path, 'w') do |f|
         f << '12345'
       end
-      stub_request(:put, "http://#{endpoint_unknown}/v3/table/import/db/table/format").
+      stub_request(:put, "http://api-import.treasure-data.com/v3/table/import/db/table/format").
         with(:body => '12345').
         to_return(:body => '{"elapsed_time":"1.23"}')
       File.open(t.path) do |f|
-        expect(api_unknown_host_http.import('db', 'table', 'format', f, 5)).to eq 1.23
+        api_old.import('db', 'table', 'format', f, 5).should == 1.23
       end
     end
 
@@ -135,7 +60,7 @@ describe 'Import API' do
       File.open(t.path, 'w') do |f|
         f << '12345'
       end
-      stub_request(:put, "https://#{endpoint_import}/v3/table/import/db/table/format").
+      stub_request(:put, "https://api-import.treasuredata.com/v3/table/import/db/table/format").
         with(:body => '12345').
         to_return(:status => 500)
       File.open(t.path) do |f|

data/spec/td/client/job_api_spec.rb

@@ -20,7 +20,7 @@ describe 'Job API' do
     it 'should returns 20 jobs by default' do
       stub_api_request(:get, "/v3/job/list", :query => {'from' => '0'}).to_return(:body => {'jobs' => raw_jobs}.to_json)
       jobs = api.list_jobs
-      expect(jobs.size).to eq(20)
+      jobs.size.should == 20
     end
 
     (0...MAX_JOB).each {|i|
@@ -31,22 +31,21 @@ describe 'Job API' do
         jobs = api.list_jobs
         jobs[i..i].map {|job_id, type, status, query, start_at, end_at, cpu_time,
                       result_size, result_url, priority, retry_limit, org, db,
-                      duration, num_records|
-          expect(job_id).to eq(job['job_id'])
-          expect(type).to eq(job['type'])
-          expect(status).to eq(job['status'])
-          expect(query).to eq(job['query'])
-          expect(start_at).to eq(job['start_at'])
-          expect(end_at).to eq(job['end_at'])
-          expect(cpu_time).to eq(job['cpu_time'])
-          expect(result_size).to eq(job['result_size'])
-          expect(result_url).to eq(job['result_url'])
-          expect(priority).to eq(job['priority'])
-          expect(retry_limit).to eq(job['retry_limit'])
-          expect(org).to eq(job['organization'])
-          expect(db).to eq(job['database'])
-          expect(duration).to eq(job['duration'])
-          expect(num_records).to eq(job['num_records'])
+                      duration|
+          job_id.should == job['job_id']
+          type.should == job['type']
+          status.should == job['status']
+          query.should == job['query']
+          start_at.should == job['start_at']
+          end_at.should == job['end_at']
+          cpu_time.should == job['cpu_time']
+          result_size.should == job['result_size']
+          result_url.should == job['result_url']
+          priority.should == job['priority']
+          retry_limit.should == job['retry_limit']
+          org.should == job['organization']
+          db.should == job['database']
+          duration.should == job['duration']
         }
       end
     }
@@ -54,14 +53,14 @@ describe 'Job API' do
     it 'should returns 10 jobs with to parameter' do
       stub_api_request(:get, "/v3/job/list", :query => {'from' => '0', 'to' => '10'}).to_return(:body => {'jobs' => raw_jobs[0...10]}.to_json)
       jobs = api.list_jobs(0, 10)
-      expect(jobs.size).to eq(10)
+      jobs.size.should == 10
     end
 
     it 'should returns 10 jobs with to status parameter' do
       error_jobs = raw_jobs.select { |j| j['status'] == 'error' }
       stub_api_request(:get, "/v3/job/list", :query => {'from' => '0', 'status' => 'error'}).to_return(:body => {'jobs' => error_jobs}.to_json)
       jobs = api.list_jobs(0, nil, 'error')
-      expect(jobs.size).to eq(error_jobs.size)
+      jobs.size.should == error_jobs.size
     end
 
     #it 'should contain the result_size field' do
@@ -75,23 +74,22 @@ describe 'Job API' do
         stub_api_request(:get, "/v3/job/show/#{e(i)}").to_return(:body => job.to_json)
 
         type, query, status, url, debug, start_at, end_at, cpu_time,
-          result_size, result_url, hive_result_schema, priority, retry_limit, org, db, num_records = api.show_job(i)
-        expect(type).to eq(job['type'])
-        expect(query).to eq(job['query'])
-        expect(status).to eq(job['status'])
-        expect(url).to eq(job['url'])
-        expect(debug).to eq(job['debug'])
-        expect(start_at).to eq(job['start_at'])
-        expect(end_at).to eq(job['end_at'])
-        expect(cpu_time).to eq(job['cpu_time'])
-        expect(result_size).to eq(job['result_size'])
-        expect(result_url).to eq(job['result_url'])
-        expect(hive_result_schema).to eq(job['hive_result_schema'])
-        expect(result_url).to eq(job['result_url'])
-        expect(priority).to eq(job['priority'])
-        expect(org).to eq(job['organization'])
-        expect(db).to eq(job['database'])
-        expect(num_records).to eq(job['num_records'])
+          result_size, result_url, hive_result_schema, priority, retry_limit, org, db = api.show_job(i)
+        type.should == job['type']
+        query.should == job['query']
+        status.should == job['status']
+        url.should == job['url']
+        debug.should == job['debug']
+        start_at.should == job['start_at']
+        end_at.should == job['end_at']
+        cpu_time.should == job['cpu_time']
+        result_size.should == job['result_size']
+        result_url.should == job['result_url']
+        hive_result_schema.should == job['hive_result_schema']
+        result_url.should == job['result_url']
+        priority.should == job['priority']
+        org.should == job['organization']
+        db.should == job['database']
       end
     }
 
@@ -131,7 +129,7 @@ describe 'Job API' do
         stub_api_request(:get, "/v3/job/status/#{e(job_id)}").to_return(:body => result_job.to_json)
 
         status = api.job_status(job_id)
-        expect(status).to eq(i.odd? ? 'success' : 'error')
+        status.should == (i.odd? ? 'success' : 'error')
       end
     }
   end
@@ -146,7 +144,7 @@ describe 'Job API' do
       stub_api_request(:post, "/v3/job/issue/hive/#{e(db_name)}").with(:body => params).to_return(return_body)
 
       job_id = api.hive_query(query, db_name)
-      expect(job_id).to eq('1')
+      job_id.should == '1'
     end
 
     it 'issue a query with result_url' do
@@ -154,7 +152,7 @@ describe 'Job API' do
       stub_api_request(:post, "/v3/job/issue/hive/#{e(db_name)}").with(:body => params).to_return(return_body)
 
       job_id = api.hive_query(query, db_name, 'td://@/test/table')
-      expect(job_id).to eq('1')
+      job_id.should == '1'
     end
 
     it 'issue a query with priority' do
@@ -162,13 +160,13 @@ describe 'Job API' do
       stub_api_request(:post, "/v3/job/issue/hive/#{e(db_name)}").with(:body => params).to_return(return_body)
 
       job_id = api.hive_query(query, db_name, nil, 1)
-      expect(job_id).to eq('1')
+      job_id.should == '1'
     end
   end
 
   describe 'job_result' do
     let :packed do
-      s = StringIO.new(String.new)
+      s = StringIO.new
       pk = MessagePack::Packer.new(s)
       pk.write('hello')
       pk.write('world')
@@ -180,167 +178,13 @@ describe 'Job API' do
       stub_api_request(:get, '/v3/job/result/12345').
         with(:query => {'format' => 'msgpack'}).
         to_return(:body => packed)
-      expect(api.job_result(12345)).to eq(['hello', 'world'])
+      api.job_result(12345).should == ['hello', 'world']
     end
-
-    it '200->200 cannot resume' do
-      sz = packed.bytesize / 3
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(:query => {'format' => 'msgpack'}).
-        to_return(
-          :headers => {
-            'Content-Length' => packed.bytesize,
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed[0, sz]
-        )
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(
-          :headers => {
-            'If-Range' => '"abcdefghijklmn"',
-            'Range' => "bytes=#{sz}-",
-          },
-          :query => {'format' => 'msgpack'}
-        ).
-        to_return(
-          :status => 200,
-          :headers => {
-            'Content-Length' => packed.bytesize - sz,
-            'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed
-        )
-      expect(api).to receive(:sleep).once
-      expect($stderr).to receive(:print)
-      expect($stderr).to receive(:puts)
-      expect{api.job_result(12345)}.to raise_error(TreasureData::APIError)
-    end
-
-    it '200->403 cannot resume' do
-      sz = packed.bytesize / 3
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(:query => {'format' => 'msgpack'}).
-        to_return(
-          :headers => {
-            'Content-Length' => packed.bytesize,
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed[0, sz]
-        )
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(
-          :headers => {
-            'If-Range' => '"abcdefghijklmn"',
-            'Range' => "bytes=#{sz}-",
-          },
-          :query => {'format' => 'msgpack'}
-        ).
-        to_return(
-          :status => 403,
-          :headers => {
-            'Content-Length' => packed.bytesize - sz,
-            'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed
-        )
-      expect(api).to receive(:sleep).once
-      expect($stderr).to receive(:print)
-      expect($stderr).to receive(:puts)
-      expect{api.job_result(12345)}.to raise_error(TreasureData::APIError)
-    end
-
-    it 'can resume' do
-      sz = packed.bytesize / 3
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(:query => {'format' => 'msgpack'}).
-        to_return(
-          :headers => {
-            'Content-Length' => packed.bytesize,
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed[0, sz]
-        )
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(
-          :headers => {
-            'If-Range' => '"abcdefghijklmn"',
-            'Range' => "bytes=#{sz}-",
-          },
-          :query => {'format' => 'msgpack'}
-        ).
-        to_return(
-          :status => 206,
-          :headers => {
-            'Content-Length' => packed.bytesize - sz,
-            'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed[sz, packed.bytesize - sz]
-        )
-      expect(api).to receive(:sleep).once
-      expect($stderr).to receive(:print)
-      expect($stderr).to receive(:puts)
-      expect(api.job_result(12345)).to eq ['hello', 'world']
-    end
-
-    it '200->500->206 can resume' do
-      sz = packed.bytesize / 3
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(:query => {'format' => 'msgpack'}).
-        to_return(
-          :headers => {
-            'Content-Length' => packed.bytesize,
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed[0, sz]
-        )
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(
-          :headers => {
-            'If-Range' => '"abcdefghijklmn"',
-            'Range' => "bytes=#{sz}-",
-          },
-          :query => {'format' => 'msgpack'}
-        ).
-        to_return(
-          :status => 500,
-          :headers => {
-            'Content-Length' => packed.bytesize - sz,
-            'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed
-        )
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(
-          :headers => {
-            'If-Range' => '"abcdefghijklmn"',
-            'Range' => "bytes=#{sz}-",
-          },
-          :query => {'format' => 'msgpack'}
-        ).
-        to_return(
-          :status => 206,
-          :headers => {
-            'Content-Length' => packed.bytesize - sz,
-            'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed[sz, packed.bytesize - sz]
-        )
-      expect(api).to receive(:sleep).once
-      expect($stderr).to receive(:print)
-      expect($stderr).to receive(:puts)
-      expect(api.job_result(12345)).to eq ['hello', 'world']
-    end
-
   end
 
   describe 'job_result_format' do
     let :packed do
-      s = StringIO.new(String.new)
+      s = StringIO.new
       Zlib::GzipWriter.wrap(s) do |f|
         f << ['hello', 'world'].to_json
       end
@@ -359,8 +203,8 @@ describe 'Job API' do
         total_size = 0
         api.job_result_format(12345, 'json', io) {|size| total_size += size }
 
-        expect(io.string).to  eq(json)
-        expect(total_size).to eq(json.size)
+        io.string.should  == json
+        total_size.should == json.size
       end
     end
 
@@ -372,7 +216,7 @@ describe 'Job API' do
             :headers => {'Content-Encoding' => 'gzip'},
             :body => packed
           )
-        expect(api.job_result_format(12345, 'json')).to eq(['hello', 'world'].to_json)
+        api.job_result_format(12345, 'json').should == ['hello', 'world'].to_json
       end
 
       it 'writes formatted job result' do
@@ -384,66 +228,24 @@ describe 'Job API' do
           )
         s = StringIO.new
         api.job_result_format(12345, 'json', s)
-        expect(s.string).to eq(['hello', 'world'].to_json)
-      end
-
-      context 'can resume' do
-        before do
-          sz = packed.bytesize / 3
-          stub_api_request(:get, '/v3/job/result/12345').
-            with(:query => {'format' => 'json'}).
-            to_return(
-              :headers => {
-                'Content-Encoding' => 'gzip',
-                'Content-Length' => packed.bytesize,
-                'Etag' => '"abcdefghijklmn"',
-              },
-              :body => packed[0, sz]
-            )
-          stub_api_request(:get, '/v3/job/result/12345').
-            with(
-              :headers => {
-                'If-Range' => '"abcdefghijklmn"',
-                'Range' => "bytes=#{sz}-",
-              },
-              :query => {'format' => 'json'}
-            ).
-          to_return(
-            :status => 206,
-            :headers => {
-              'Content-Encoding' => 'gzip',
-              'Content-Length' => packed.bytesize-sz,
-              'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
-              'Etag' => '"abcdefghijklmn"',
-            },
-            :body => packed[sz, packed.bytesize-sz]
-          )
-          expect(api).to receive(:sleep).once
-          expect($stderr).to receive(:print)
-          expect($stderr).to receive(:puts)
-        end
-        it 'can work with io' do
-          s = StringIO.new
-          api.job_result_format(12345, 'json', s)
-          expect(s.string).to eq ['hello', 'world'].to_json
-        end
-        it 'can work without block' do
-          expect(api.job_result_format(12345, 'json')).to eq ['hello', 'world'].to_json
-        end
+        s.string.should == ['hello', 'world'].to_json
       end
     end
   end
 
   describe 'job_result_each' do
     let :packed do
-      s = StringIO.new(String.new)
-      Zlib::GzipWriter.wrap(s) do |f|
-        pk = MessagePack::Packer.new(f)
-        pk.write('hello')
-        pk.write('world')
-        pk.flush
+      s = StringIO.new
+      pk = MessagePack::Packer.new(s)
+      pk.write('hello')
+      pk.write('world')
+      pk.flush
+      s.rewind
+      out = StringIO.new
+      Zlib::GzipWriter.wrap(out) do |f|
+        f.write s.read
       end
-      s.string
+      out.string
     end
 
     it 'yields job result for each row' do
@@ -457,46 +259,7 @@ describe 'Job API' do
       api.job_result_each(12345) do |row|
         result << row
       end
-      expect(result).to eq(['hello', 'world'])
-    end
-
-    it 'can resume' do
-      sz= packed.bytesize / 3
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(:query => {'format' => 'msgpack'}).
-        to_return(
-          :headers => {
-            'Content-Encoding' => 'gzip',
-            'Content-Length' => packed.bytesize,
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed[0, sz]
-        )
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(
-          :headers => {
-            'If-Range' => '"abcdefghijklmn"',
-            'Range' => "bytes=#{sz}-",
-          },
-          :query => {'format' => 'msgpack'}
-        ).
-        to_return(
-          :status => 206,
-          :headers => {
-            'Content-Length' => packed.bytesize-sz,
-            'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed[sz, packed.bytesize-sz]
-        )
-      expect(api).to receive(:sleep).once
-      expect($stderr).to receive(:print)
-      expect($stderr).to receive(:puts)
-      result = []
-      api.job_result_each(12345) do |row|
-        result << row
-      end
-      expect(result).to eq ['hello', 'world']
+      result.should == ['hello', 'world']
     end
   end
 
@@ -511,7 +274,7 @@ describe 'Job API' do
       #   pk.flush
       # end
       # s.string
-      "\x1F\x8B\b\x00#\xA1\x93T\x00\x03[\x9A\x91\x9A\x93\x93\xBF\xB4<\xBF('\x05\x00e 0\xB3\f\x00\x00\x00".force_encoding(Encoding::ASCII_8BIT)
+      "\u001F\x8B\b\u0000#\xA1\x93T\u0000\u0003[\x9A\x91\x9A\x93\x93\xBF\xB4<\xBF('\u0005\u0000e 0\xB3\f\u0000\u0000\u0000"
     end
 
     it 'yields job result for each row with progress' do
@@ -525,46 +288,7 @@ describe 'Job API' do
       api.job_result_each_with_compr_size(12345) do |row, size|
         result << [row, size]
       end
-      expect(result).to eq([['hello', 32], ['world', 32]])
-    end
-
-    it 'can resume' do
-      sz = packed.bytesize / 3
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(:query => {'format' => 'msgpack'}).
-        to_return(
-          :headers => {
-            'Content-Encoding' => 'gzip',
-            'Content-Length' => packed.bytesize,
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed[0, sz]
-        )
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(
-          :headers => {
-            'If-Range' => '"abcdefghijklmn"',
-            'Range' => "bytes=#{sz}-",
-          },
-          :query => {'format' => 'msgpack'}
-        ).
-        to_return(
-          :status => 206,
-          :headers => {
-            'Content-Length' => packed.bytesize - sz,
-            'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed[sz, packed.bytesize - sz]
-        )
-      expect(api).to receive(:sleep).once
-      expect($stderr).to receive(:print)
-      expect($stderr).to receive(:puts)
-      result = []
-      api.job_result_each_with_compr_size(12345) do |row, size|
-        result << [row, size]
-      end
-      expect(result).to eq [['hello', 32], ['world', 32]]
+      result.should == [['hello', 32], ['world', 32]]
     end
   end
 
@@ -578,7 +302,7 @@ describe 'Job API' do
           to_return(:body => 'raw binary')
         api.job_result_raw(12345, 'json', io)
 
-        expect(io.string).to eq('raw binary')
+        io.string.should == 'raw binary'
       end
     end
 
@@ -587,246 +311,16 @@ describe 'Job API' do
         stub_api_request(:get, '/v3/job/result/12345').
           with(:query => {'format' => 'json'}).
           to_return(:body => 'raw binary')
-        expect(api.job_result_raw(12345, 'json')).to eq('raw binary')
+        api.job_result_raw(12345, 'json').should == 'raw binary'
       end
     end
-
-    let :packed do
-      # Hard code fixture data to make the size stable
-      # s = StringIO.new
-      # Zlib::GzipWriter.wrap(s) do |f|
-      #   pk = MessagePack::Packer.new(f)
-      #   pk.write('hello')
-      #   pk.write('world')
-      #   pk.flush
-      # end
-      # s.string
-      "\x1F\x8B\b\x00#\xA1\x93T\x00\x03[\x9A\x91\x9A\x93\x93\xBF\xB4<\xBF('\x05\x00e 0\xB3\f\x00\x00\x00".force_encoding(Encoding::ASCII_8BIT)
-    end
-
-    it 'can resume' do
-      sz = packed.bytesize / 3
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(:query => {'format' => 'msgpack.gz'}).
-        to_return(
-          :headers => {
-            'Content-Length' => packed.bytesize,
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed[0, sz]
-        )
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(
-          :headers => {
-            'If-Range' => '"abcdefghijklmn"',
-            'Range' => "bytes=#{sz}-",
-          },
-          :query => {'format' => 'msgpack.gz'}
-        ).
-        to_return(
-          :status => 206,
-          :headers => {
-            'Content-Length' => packed.bytesize - sz,
-            'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed[sz, packed.bytesize - sz]
-        )
-      expect(api).to receive(:sleep).once
-      expect($stderr).to receive(:print)
-      expect($stderr).to receive(:puts)
-      sio = StringIO.new(String.new)
-      api.job_result_raw(12345, 'msgpack.gz', sio)
-      expect(sio.string).to eq(packed)
-    end
   end
 
   describe 'kill' do
     it 'kills a job' do
       stub_api_request(:post, '/v3/job/kill/12345').
         to_return(:body => {'former_status' => 'status'}.to_json)
-      expect(api.kill(12345)).to eq('status')
-    end
-  end
-
-  describe 'job_result_download' do
-    let (:data){ [[1, 'hello', nil], [2, 'world', true], [3, '!', false]] }
-    let :formatted do
-      case format
-      when 'json'
-        data.map{|a| JSON(a) }.join("\n")
-      when 'msgpack'
-        pk = MessagePack::Packer.new
-        data.each{|x| pk.write(x) }
-        pk.to_str
-      else
-        raise
-      end
-    end
-    let :gziped do
-      s = StringIO.new(String.new)
-      Zlib::GzipWriter.wrap(s) do |f|
-        f.write formatted
-      end
-      s.string
-    end
-    let :deflated do
-      Zlib::Deflate.deflate(formatted)
-    end
-    subject do
-      str = ''
-      api.__send__(:job_result_download, 12345, format){|x| str << x }
-      str
-    end
-    context '200' do
-      before do
-        sz = packed.bytesize / 3
-        stub_api_request(:get, '/v3/job/result/12345').
-          with(:query => {'format' => format}).
-          to_return(
-            :headers => {
-              'Content-Encoding' => content_encoding,
-              'Content-Length' => packed.bytesize,
-              'Etag' => '"abcdefghijklmn"',
-            },
-            :body => packed
-          )
-        expect(api).not_to receive(:sleep)
-        expect($stderr).not_to receive(:print)
-        expect($stderr).not_to receive(:puts)
-      end
-      context 'Content-Encoding: gzip' do
-        let (:content_encoding){ 'gzip' }
-        let (:packed){ gziped }
-        context 'msgpack' do
-          let (:format){ 'msgpack' }
-          it { is_expected.to eq formatted }
-        end
-        context 'json' do
-          let (:format){ 'json' }
-          it { is_expected.to eq formatted }
-        end
-      end
-      context 'Content-Encoding: deflate' do
-        let (:content_encoding){ 'deflate' }
-        let (:packed){ deflated }
-        context 'msgpack' do
-          let (:format){ 'msgpack' }
-          it { is_expected.to eq formatted }
-        end
-        context 'json' do
-          let (:format){ 'json' }
-          it { is_expected.to eq formatted }
-        end
-      end
-    end
-
-    context '200 -> 206' do
-      before do
-        sz = packed.bytesize / 3
-        stub_api_request(:get, '/v3/job/result/12345').
-          with(:query => {'format' => format}).
-          to_return(
-            :headers => {
-              'Content-Encoding' => content_encoding,
-              'Content-Length' => packed.bytesize,
-              'Etag' => '"abcdefghijklmn"',
-            },
-            :body => packed[0, sz]
-        )
-        stub_api_request(:get, '/v3/job/result/12345').
-          with(
-            :headers => {
-              'If-Range' => '"abcdefghijklmn"',
-              'Range' => "bytes=#{sz}-",
-          },
-          :query => {'format' => format}
-        ).
-          to_return(
-            :status => 206,
-            :headers => {
-              'Content-Encoding' => content_encoding,
-              'Content-Length' => packed.bytesize - sz,
-              'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
-              'Etag' => '"abcdefghijklmn"',
-            },
-            :body => packed[sz, packed.bytesize - sz]
-        )
-        expect(api).to receive(:sleep).once
-        allow($stderr).to receive(:print)
-        allow($stderr).to receive(:puts)
-      end
-      context 'Content-Encoding: gzip' do
-        let (:content_encoding){ 'gzip' }
-        let (:packed){ gziped }
-        context 'msgpack' do
-          let (:format){ 'msgpack' }
-          it { is_expected.to eq formatted }
-        end
-        context 'json' do
-          let (:format){ 'json' }
-          it { is_expected.to eq formatted }
-        end
-      end
-      context 'Content-Encoding: deflate' do
-        let (:content_encoding){ 'deflate' }
-        let (:packed){ deflated }
-        context 'msgpack' do
-          let (:format){ 'msgpack' }
-          it { is_expected.to eq formatted }
-        end
-        context 'json' do
-          let (:format){ 'json' }
-          it { is_expected.to eq formatted }
-        end
-      end
-    end
-
-    context 'without autodecode' do
-      before do
-        sz = packed.bytesize / 3
-        stub_api_request(:get, '/v3/job/result/12345').
-          with(:query => {'format' => format}).
-          to_return(
-            :headers => {
-              'Content-Length' => packed.bytesize,
-              'Etag' => '"abcdefghijklmn"',
-            },
-            :body => packed
-          )
-        expect(api).not_to receive(:sleep)
-        expect($stderr).not_to receive(:print)
-        expect($stderr).not_to receive(:puts)
-      end
-      subject do
-        str = ''
-        api.__send__(:job_result_download, 12345, format, false){|x| str << x }
-        str
-      end
-      context 'Content-Encoding: gzip' do
-        let (:content_encoding){ 'gzip' }
-        let (:packed){ gziped }
-        context 'msgpack' do
-          let (:format){ 'msgpack' }
-          it { is_expected.to eq packed }
-        end
-        context 'json' do
-          let (:format){ 'json' }
-          it { is_expected.to eq packed }
-        end
-      end
-      context 'Content-Encoding: deflate' do
-        let (:content_encoding){ 'deflate' }
-        let (:packed){ deflated }
-        context 'msgpack' do
-          let (:format){ 'msgpack' }
-          it { is_expected.to eq packed }
-        end
-        context 'json' do
-          let (:format){ 'json' }
-          it { is_expected.to eq packed }
-        end
-      end
+      api.kill(12345).should == 'status'
     end
   end
 end