Merge branch 'master' into regen_gocloud

googleapis · Oct 15, 2021 · f5d12fc · f5d12fc
2 parents df9ff44 + faa764c
commit f5d12fc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/firestore/go.mod b/firestore/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/google/go-cmp v0.5.6
 	github.com/googleapis/gax-go/v2 v2.1.1
 	google.golang.org/api v0.58.0
-	google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0
+	google.golang.org/genproto v0.0.0-20211015135405-485ec31e706e
 	google.golang.org/grpc v1.40.0
 	google.golang.org/protobuf v1.27.1
 )
diff --git a/firestore/go.sum b/firestore/go.sum
@@ -492,8 +492,9 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc
 google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
 google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
 google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0 h1:5Tbluzus3QxoAJx4IefGt1W0HQZW4nuMrVk684jI74Q=
 google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211015135405-485ec31e706e h1:8QimPqBPS4AUoLliaTHdC00MiGVe4csovJUlesHP9Mw=
+google.golang.org/genproto v0.0.0-20211015135405-485ec31e706e/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=

diff --git a/firestore/integration_test.go b/firestore/integration_test.go
@@ -1603,14 +1603,15 @@ func TestDetectProjectID(t *testing.T) {
 }
 
 func TestIntegration_ColGroupRefPartitions(t *testing.T) {
-	t.Skip("https://github.com/googleapis/google-cloud-go/issues/4717")
 	h := testHelper{t}
-	coll := integrationColl(t)
+	client := integrationClient(t)
+	coll := client.Collection(collectionIDs.New())
 	ctx := context.Background()
 
 	// Create a doc in the test collection so a collectionID is live for testing
 	doc := coll.NewDoc()
 	h.mustCreate(doc, integrationTestMap)
+	defer doc.Delete(ctx)
 
 	for idx, tc := range []struct {
 		collectionID           string
@@ -1629,17 +1630,18 @@ func TestIntegration_ColGroupRefPartitions(t *testing.T) {
 		if got, want := len(partitions), tc.expectedPartitionCount; got != want {
 			t.Errorf("Unexpected Partition Count:index:%d, got %d, want %d", idx, got, want)
 			for _, v := range partitions {
-				t.Errorf("Partition: %v, %v", v.startDoc, v.endDoc)
+				t.Errorf("Partition: %v, %v, %v, %v", v.startDoc, v.endDoc, v.startVals, v.endVals)
 			}
 		}
 	}
+
 }
 
 func TestIntegration_ColGroupRefPartitionsLarge(t *testing.T) {
 	// Create collection with enough documents to have multiple partitions.
-	coll := integrationColl(t)
-	collectionID := coll.collectionID + "largeCollection"
-	coll = iClient.Collection(collectionID)
+	client := integrationClient(t)
+	coll := client.Collection(collectionIDs.New())
+	collectionID := coll.collectionID
 
 	ctx := context.Background()