Remove dsQueryBatch in favor of ds.Batcher.

appengine/tsmon/handler_test.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package tsmon
 
 import (
         "fmt"
         "net/http"
         "net/http/httptest"
@@ skipping 122 matching lines @@
                 So(rec.Code, ShouldEqual, http.StatusOK)
 
                 i, err := getOrCreateInstanceEntity(c)
                 So(err, ShouldBeNil)
                 So(i.TaskNum, ShouldEqual, 1)
         })
 
         Convey("Expires old instances", t, func() {
                 c, clock := buildGAETestContext()
 
-                for _, count := range []int{1, housekeepingInstanceBatchSize + 1} {
+                for _, count := range []int{1, ds.Raw(c).Constraints().QueryBatchSize + 1} {
                         Convey(fmt.Sprintf("Count: %d", count), func() {
                                 insts := make([]*instance, count)
                                 keys := make([]*ds.Key, count)
                                 for i := 0; i < count; i++ {
                                         insts[i] = &instance{
                                                 ID:          fmt.Sprintf("foobar_%d", i),
                                                 TaskNum:     i,
                                                 LastUpdated: clock.Now(),
                                         }
                                         keys[i] = ds.KeyForObj(c, insts[i])
@@ skipping 14 matching lines @@
                                 })
                                 So(rec.Code, ShouldEqual, http.StatusOK)
 
                                 exists, err = ds.Exists(c, keys)
                                 So(err, ShouldBeNil)
                                 So(exists.Any(), ShouldBeFalse)
                         })
                 }
         })
 }