Isolate: Use generators instead of seekers

client/archiver/archiver_test.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package archiver
 
 import (
-        "bytes"
         "fmt"
         "io/ioutil"
         "log"
         "net/http/httptest"
         "os"
         "path/filepath"
         "testing"
 
         "github.com/luci/luci-go/client/internal/common"
         "github.com/luci/luci-go/client/isolatedclient"
@@ skipping 60 matching lines @@
         ut.AssertEqual(t, nil, server.Error())
 }
 
 func TestArchiverFileHit(t *testing.T) {
         t.Parallel()
         server := isolatedfake.New()
         ts := httptest.NewServer(server)
         defer ts.Close()
         a := New(isolatedclient.New(nil, ts.URL, "default-gzip"), nil)
         server.Inject([]byte("foo"))
-        future := a.Push("foo", bytes.NewReader([]byte("foo")), 0)
+        future := a.Push("foo", isolatedclient.NewBytesSource([]byte("foo")), 0)
         future.WaitForHashed()
         ut.AssertEqual(t, isolated.HexDigest("0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33"), future.Digest())
         ut.AssertEqual(t, nil, a.Close())
 
         stats := a.Stats()
         ut.AssertEqual(t, 1, stats.TotalHits())
         ut.AssertEqual(t, 0, stats.TotalMisses())
         ut.AssertEqual(t, units.Size(3), stats.TotalBytesHits())
         ut.AssertEqual(t, units.Size(0), stats.TotalBytesPushed())
 }
@@ skipping 20 matching lines @@
 
         fileName := filepath.Join(tmpDir, "existent")
         ut.AssertEqual(t, nil, ioutil.WriteFile(fileName, []byte("foo"), 0600))
         future2 := a.PushFile("existent", fileName, 0)
         future1.WaitForHashed()
         future2.WaitForHashed()
         osErr := "no such file or directory"
         if common.IsWindows() {
                 osErr = "The system cannot find the file specified."
         }
-        expected := fmt.Errorf("hash(foo) failed: open %s: %s\n", nonexistent, osErr)
+        expected := fmt.Errorf("source(foo) failed: open %s: %s\n", nonexistent, osErr)
         ut.AssertEqual(t, expected, <-a.Channel())
         ut.AssertEqual(t, expected, a.Close())
         ut.AssertEqual(t, nil, server.Error())
 }
 
 func TestArchiverPushClosed(t *testing.T) {
         t.Parallel()
         a := New(nil, nil)
         ut.AssertEqual(t, nil, a.Close())
         ut.AssertEqual(t, nil, a.PushFile("ignored", "ignored", 0))
 }
-
-func TestArchiverPushSeeked(t *testing.T) {
-        t.Parallel()
-        server := isolatedfake.New()
-        ts := httptest.NewServer(server)
-        defer ts.Close()
-        a := New(isolatedclient.New(nil, ts.URL, "default-gzip"), nil)
-        misplaced := bytes.NewReader([]byte("foo"))
-        _, _ = misplaced.Seek(1, os.SEEK_SET)
-        future := a.Push("works", misplaced, 0)
-        future.WaitForHashed()
-        ut.AssertEqual(t, isolated.HexDigest("0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33"), future.Digest())
-        ut.AssertEqual(t, nil, a.Close())
-}