commit 5d4e2c30ce048e7da59a5ce379b418e927e19130
author Kevin Lubick <kjlubick@google.com> Thu Aug 08 14:23:57 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 08 18:33:42 2019 +0000
tree 783863a55b876bc31883fe27d8496f4917255777
parent da67061eaa06774447891c9b07be1c2d9a137d4a

Followup feedback on ingester test

Change-Id: I87310eb3d64452525da0c47f6afb537fc56e66b0
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/233357
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Auto-Submit: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>

go/ingestion/ingestion.go

diff --git a/go/ingestion/ingestion.go b/go/ingestion/ingestion.go
index a5875d2..a188cd1 100644
--- a/go/ingestion/ingestion.go
+++ b/go/ingestion/ingestion.go
@@ -247,12 +247,7 @@
 	if len(hashes) < i.nCommits {
 		for len(hashes) < i.nCommits && delta < 365*24*time.Hour {
 			delta *= 2
-			moreHashes := i.vcs.From(now.Add(delta))
-			if len(moreHashes) == len(hashes) {
-				hashes = moreHashes
-				break
-			}
-			hashes = moreHashes
+			hashes = i.vcs.From(now.Add(delta))
 		}
 
 		// In case we have retrieved too many commits.

go/ingestion/ingestion_test.go

diff --git a/go/ingestion/ingestion_test.go b/go/ingestion/ingestion_test.go
index 6031d1b..80876bb 100644
--- a/go/ingestion/ingestion_test.go
+++ b/go/ingestion/ingestion_test.go
@@ -20,7 +20,6 @@
 	"go.skia.org/infra/go/sharedconfig"
 	"go.skia.org/infra/go/testutils"
 	"go.skia.org/infra/go/testutils/unittest"
-	"go.skia.org/infra/go/util"
 	"go.skia.org/infra/go/vcsinfo"
 	mockvcs "go.skia.org/infra/go/vcsinfo/mocks"
 )
@@ -143,7 +142,7 @@
 
 	i, err := NewIngester("test-ingester-1", conf, mvs, nil, nil, mis, meb)
 	assert.NoError(t, err)
-	defer util.Close(i)
+	defer testutils.AssertCloses(t, i)
 
 	ts, err := i.getStartTimeOfInterest(context.Background(), now)
 	assert.NoError(t, err)
@@ -189,7 +188,7 @@
 
 	i, err := NewIngester("test-ingester-2", conf, mvs, nil, nil, mis, meb)
 	assert.NoError(t, err)
-	defer util.Close(i)
+	defer testutils.AssertCloses(t, i)
 
 	ts, err := i.getStartTimeOfInterest(context.Background(), now)
 	assert.NoError(t, err)
@@ -211,7 +210,7 @@
 
 	// arbitrary date
 	now := time.Date(2019, 8, 5, 11, 20, 0, 0, time.UTC)
-	alphaTime := time.Date(2019, 8, 1, 17, 35, 0, 0, time.UTC)
+	alphaTime := time.Date(2019, 8, 2, 17, 35, 0, 0, time.UTC)
 
 	hashes := []string{"alpha", "beta", "gamma", "delta", "epsilon"}
 
@@ -229,7 +228,7 @@
 
 	i, err := NewIngester("test-ingester-3", conf, mvs, nil, nil, mis, meb)
 	assert.NoError(t, err)
-	defer util.Close(i)
+	defer testutils.AssertCloses(t, i)
 
 	ts, err := i.getStartTimeOfInterest(context.Background(), now)
 	assert.NoError(t, err)